diff options
| author | Werner Koch <wk@gnupg.org> | 2007-12-17 11:49:58 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-12-17 11:49:58 +0100 |
| commit | 5967e1a187de9460524778f6e269d45996e9051c (patch) | |
| tree | 86b56f5e9a3a677984ba57c3debe2dc3880ead69 /m4 | |
| parent | Preparing a release candidate. (diff) | |
| download | gnupg2-5967e1a187de9460524778f6e269d45996e9051c.tar.xz gnupg2-5967e1a187de9460524778f6e269d45996e9051c.zip | |
Fixed a W32 ldaps problem.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/ldap.m4 | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 94497b322..ddbd9ccf1 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2007-12-17 Werner Koch <wk@g10code.com> + + * ldap.m4: Test for ldap_start_tls_sA. + 2007-06-15 Marcus Brinkmann <marcus@g10code.de> * Makefile.am (EXTRA_DIST): Remove inttypes-h.m4, longlong.m4 and diff --git a/m4/ldap.m4 b/m4/ldap.m4 index a065e5535..f4462ca0d 100644 --- a/m4/ldap.m4 +++ b/m4/ldap.m4 @@ -67,7 +67,10 @@ if test x$_ldap_with != xno ; then LDAPLIBS="$LDAP_LDFLAGS $MY_LDAPLIBS" GPGKEYS_LDAP="gpg2keys_ldap$EXEEXT" - AC_CHECK_FUNCS(ldap_get_option ldap_set_option ldap_start_tls_s) + AC_CHECK_FUNCS(ldap_get_option ldap_set_option) + # The extra test for ldap_start_tls_sA is for W32 because + # that is the actual function in the library. + AC_CHECK_FUNCS(ldap_start_tls_s ldap_start_tls_sA) if test "$ac_cv_func_ldap_get_option" != yes ; then AC_MSG_CHECKING([whether LDAP supports ld_errno]) |