diff options
| author | Werner Koch <wk@gnupg.org> | 2014-10-17 15:59:45 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-10-17 15:59:45 +0200 |
| commit | 6d9491842d5da597980eaa59e1e3e2137965fe09 (patch) | |
| tree | 36008bfadfbb0a248d7b063130e27ba414cfc273 /dirmngr/Makefile.am | |
| parent | w32: Set SYSROOT to help finding config scripts. (diff) | |
| download | gnupg2-6d9491842d5da597980eaa59e1e3e2137965fe09.tar.xz gnupg2-6d9491842d5da597980eaa59e1e3e2137965fe09.zip | |
dirmngr: Allow building without LDAP support.
* configure.ac: Add option --disable-ldap.
(USE_LDAP): New ac_define and am_conditional.
* dirmngr/Makefile.am: Take care of USE_LDAP.
* dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
and do not call any ldap function.
* dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
* dirmngr/crlfetch.c (!USE_LDAP): Ditto.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/Makefile.am')
| -rw-r--r-- | dirmngr/Makefile.am | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index 632e52582..0e9a7c757 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -44,19 +44,27 @@ else ldap_url = endif +if USE_LDAPWRAPPER +extraldap_src = ldap-wrapper.c +else +extraldap_src = ldap-wrapper-ce.c dirmngr_ldap.c +endif + noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \ - ldapserver.h ldapserver.c certcache.c certcache.h \ - cdb.h cdblib.c ldap.c misc.c dirmngr-err.h w32-ldap-help.h \ - ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h $(ldap_url) \ + certcache.c certcache.h \ + cdb.h cdblib.c misc.c dirmngr-err.h \ + ocsp.c ocsp.h validate.c validate.h \ ks-action.c ks-action.h ks-engine.h \ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c -if USE_LDAPWRAPPER -dirmngr_SOURCES += ldap-wrapper.c +if USE_LDAP +dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \ + ldap-wrapper.h $(ldap_url) $(extraldap_src) +ldaplibs = $(LDAPLIBS) else -dirmngr_SOURCES += ldap-wrapper-ce.c dirmngr_ldap.c +ldaplibs = endif @@ -65,7 +73,7 @@ dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) if !USE_LDAPWRAPPER -dirmngr_LDADD += $(LDAPLIBS) +dirmngr_LDADD += $(ldaplibs) endif dirmngr_LDFLAGS = $(extra_bin_ldflags) |