diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 21 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2002-05-08 David Shaw <[email protected]> + + * configure.ac: If LDAP comes up unusable, try #including <lber.h> + before giving up. Old versions of OpenLDAP require that. + 2002-05-03 David Shaw <[email protected]> * configure.ac: In g10defs.h, use \ for the directory separator diff --git a/configure.ac b/configure.ac index d5979cb6c..825ac36db 100644 --- a/configure.ac +++ b/configure.ac @@ -297,7 +297,22 @@ if test "$try_ldap" = yes ; then [gnupg_cv_func_ldap_init=yes], [gnupg_cv_func_ldap_init=no])]) - if test $gnupg_cv_func_ldap_init = yes; then + if test $gnupg_cv_func_ldap_init = no; then + AC_CACHE_CHECK([whether I can make LDAP be sane with lber.h], + [gnupg_cv_func_ldaplber_init], + [AC_TRY_LINK([#include <lber.h> +#include <ldap.h>], + [ldap_open("foobar",1234);], + [gnupg_cv_func_ldaplber_init=yes], + [gnupg_cv_func_ldaplber_init=no])]) + fi + + if test "$gnupg_cv_func_ldaplber_init" = yes ; then + AC_DEFINE(NEED_LBER_H,1,[Define if the LDAP library requires including lber.h before ldap.h]) + fi + + if test "$gnupg_cv_func_ldap_init" = yes || \ + test "$gnupg_cv_func_ldaplber_init" = yes ; then GPGKEYS_LDAP="gpgkeys_ldap" fi |