diff options
| author | Werner Koch <wk@gnupg.org> | 2010-06-09 18:53:51 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-06-09 18:53:51 +0200 |
| commit | c3f08dcb7266efeac84f5f720ec0a353a45e950d (patch) | |
| tree | 51501aa7d0e6dadb80576a1e982fdfde871bd2ad /am | |
| parent | 2010-06-08 Marcus Brinkmann <marcus@g10code.de> (diff) | |
| download | gnupg2-c3f08dcb7266efeac84f5f720ec0a353a45e950d.tar.xz gnupg2-c3f08dcb7266efeac84f5f720ec0a353a45e950d.zip | |
Merged Dirmngr with GnuPG.
A few code changes to support dirmngr.
Diffstat (limited to 'am')
| -rw-r--r-- | am/cmacros.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/am/cmacros.am b/am/cmacros.am index da45a67b7..6668b2558 100644 --- a/am/cmacros.am +++ b/am/cmacros.am @@ -25,7 +25,8 @@ AM_CPPFLAGS += -DGNUPG_BINDIR="\"$(bindir)\"" \ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\"" \ -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\"" \ -DGNUPG_DATADIR="\"$(datadir)/@PACKAGE@\"" \ - -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" + -DGNUPG_SYSCONFDIR="\"$(sysconfdir)/@PACKAGE@\"" \ + -DGNUPG_LOCALSTATEDIR="\"$(localstatedir)\"" endif @@ -47,6 +48,9 @@ endif if GNUPG_PROTECT_TOOL_PGM AM_CPPFLAGS += -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\"" endif +if GNUPG_DIRMNGR_LDAP_PGM +AM_CPPFLAGS += -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\"" +endif # Under Windows we use LockFileEx. WindowsCE provides this only on # the WindowsMobile 6 platform and thus we need to use the coredll6 |