security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* configure.ac: OpenLDAP 2.0.27 changed the dependencies again. Add a

Browse Source 
"LDAPLIBS" variable so users can try and suggest the right dependencies
for their platform.
This commit is contained in:
David Shaw 2002-10-07 22:15:20 +00:00
parent 1fed5c87f0
commit 60dff3c175
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-07 David Shaw <dshaw@jabberwocky.com>
* 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.
2002-10-02 David Shaw <dshaw@jabberwocky.com> 2002-10-02 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Add an --enable-old-tiger, to revert back to the * configure.ac: Add an --enable-old-tiger, to revert back to the

13
configure.ac
View File

@ -354,15 +354,17 @@ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
[NETLIBS="-lsocket $NETLIBS"])) [NETLIBS="-lsocket $NETLIBS"]))
# Try and link a LDAP test program to weed out unusable LDAP # Try and link a LDAP test program to weed out unusable LDAP
# libraries. -lldap [-llber [-lresolv]] is for OpenLDAP. -lldapssl41 # libraries. -lldap [-llber [-lresolv]] is for OpenLDAP. OpenLDAP in
# is for Mozilla LDAP. # 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 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 _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.h>],[ldap_open("foobar",1234);], AC_TRY_LINK([#include <ldap.h>],[ldap_open("foobar",1234);],
[gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no]) [gnupg_cv_func_ldap_init=yes],[gnupg_cv_func_ldap_init=no])
AC_MSG_RESULT([$gnupg_cv_func_ldap_init]) 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 || \ if test "$gnupg_cv_func_ldap_init" = yes || \
test "$gnupg_cv_func_ldaplber_init" = yes ; then test "$gnupg_cv_func_ldaplber_init" = yes ; then
LDAPLIBS=$MY_LDAPLIBS
GPGKEYS_LDAP="gpgkeys_ldap" GPGKEYS_LDAP="gpgkeys_ldap"
AC_MSG_CHECKING([whether LDAP supports ldap_get_option]) AC_MSG_CHECKING([whether LDAP supports ldap_get_option])