diff options
| author | Werner Koch <wk@gnupg.org> | 2010-08-02 20:54:53 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-08-02 20:54:53 +0200 |
| commit | 819f3be3585e125328025113780e2f326cc7a3e9 (patch) | |
| tree | c40e2f8c427aa29b78fbef0c44188986fb668ba6 /dirmngr/Makefile.am | |
| parent | Fixed couple of build problems. However the W32 version is currently (diff) | |
| download | gnupg2-819f3be3585e125328025113780e2f326cc7a3e9.tar.xz gnupg2-819f3be3585e125328025113780e2f326cc7a3e9.zip | |
Add code for a threaded LDAP access to replace the wrapper process.
Currently used for W32 and W32CE.
Diffstat (limited to 'dirmngr/Makefile.am')
| -rw-r--r-- | dirmngr/Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index a3adf6c46..176374901 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -36,12 +36,18 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \ BUILT_SOURCES = no-libgcrypt.c +if HAVE_W32_SYSTEM +ldap_url = ldap-url.h ldap-url.c +else +ldap_url = +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 \ - ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h + ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h $(ldap_url) if USE_LDAPWRAPPER dirmngr_SOURCES += ldap-wrapper.c @@ -52,13 +58,11 @@ endif dirmngr_LDADD = $(libcommonpth) ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV) - -if HAVE_W32_SYSTEM -ldap_url = ldap-url.h ldap-url.c -else -ldap_url = +if !USE_LDAPWRAPPER +dirmngr_LDADD += $(LDAPLIBS) endif + if USE_LDAPWRAPPER dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) no-libgcrypt.c dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) |