From 60dff3c17586c8a6318ad5ee5f607c90c947f0a1 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 7 Oct 2002 22:15:20 +0000 Subject: * configure.ac: OpenLDAP 2.0.27 changed the dependencies again. Add a "LDAPLIBS" variable so users can try and suggest the right dependencies for their platform. --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 43f3f8536..8299346a3 100644 --- a/configure.ac +++ b/configure.ac @@ -354,15 +354,17 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, [NETLIBS="-lsocket $NETLIBS"])) # Try and link a LDAP test program to weed out unusable LDAP -# libraries. -lldap [-llber [-lresolv]] is for OpenLDAP. -lldapssl41 -# is for Mozilla LDAP. +# libraries. -lldap [-llber [-lresolv]] is for OpenLDAP. OpenLDAP in +# general is terrible with creating weird dependencies. If all else +# fails, the user can play guess-the-dependency by using something +# like LDAPLIBS="-lfoo" ./configure if test "$try_ldap" = yes ; then - for LDAPLIBS in "-lldap" "-lldap -llber" "-lldap -llber -lresolv" "-lldapssl41"; do + for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv"; do _ldap_save_libs=$LIBS - LIBS="$LDAPLIBS $NETLIBS $LIBS" + LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" - AC_MSG_CHECKING([whether LDAP via \"$LDAPLIBS\" is present and sane]) + AC_MSG_CHECKING([whether LDAP via \"$MY_LDAPLIBS\" is present and sane]) AC_TRY_LINK([#include ],[ldap_open("foobar",1234);], [gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no]) AC_MSG_RESULT([$gnupg_cv_func_ldap_init]) @@ -381,6 +383,7 @@ if test "$try_ldap" = yes ; then if test "$gnupg_cv_func_ldap_init" = yes || \ test "$gnupg_cv_func_ldaplber_init" = yes ; then + LDAPLIBS=$MY_LDAPLIBS GPGKEYS_LDAP="gpgkeys_ldap" AC_MSG_CHECKING([whether LDAP supports ldap_get_option]) -- cgit v1.2.3