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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/ldap.m4 | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index ee3bc29b3..b93fa2d3c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2010-06-08 Werner Koch <wk@g10code.com> + + * ldap.m4 (gnupg_have_ldap): Set variable. + 2009-09-03 Werner Koch <wk@g10code.com> * estream.m4: Update for libestream. diff --git a/m4/ldap.m4 b/m4/ldap.m4 index f4462ca0d..954f88ad6 100644 --- a/m4/ldap.m4 +++ b/m4/ldap.m4 @@ -17,7 +17,7 @@ AC_DEFUN([GNUPG_CHECK_LDAP], # OpenLDAP, circa 1999, was terrible with creating weird dependencies. # If all else fails, the user can play guess-the-dependency by using # something like ./configure LDAPLIBS="-Lfoo -lbar" - +gnupg_have_ldap=no AC_ARG_WITH(ldap, AC_HELP_STRING([--with-ldap=DIR],[look for the LDAP library in DIR]), [_ldap_with=$withval]) @@ -66,6 +66,7 @@ if test x$_ldap_with != xno ; then test "$gnupg_cv_func_ldaplber_init" = yes ; then LDAPLIBS="$LDAP_LDFLAGS $MY_LDAPLIBS" GPGKEYS_LDAP="gpg2keys_ldap$EXEEXT" + gnupg_have_ldap=yes AC_CHECK_FUNCS(ldap_get_option ldap_set_option) # The extra test for ldap_start_tls_sA is for W32 because |