security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-19 09:02:22 +02:00
Code Activity

* configure.ac: Simplify the LDAP checking code since OpenLDAP is far more

Browse Source 
mature these days and dependencies are cleaner.  Add checks for
ldap_set_option and ldap_start_tls_s.
This commit is contained in:
David Shaw 2004-02-19 16:34:32 +00:00
parent 7e7364973d
commit ce1e817dce
2 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-02-19 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Simplify the LDAP checking code since OpenLDAP is
far more mature these days and dependencies are cleaner. Add
checks for ldap_set_option and ldap_start_tls_s.
2004-01-27 David Shaw <dshaw@jabberwocky.com> 2004-01-27 David Shaw <dshaw@jabberwocky.com>
* NEWS: Note --enable-key-cache, the OpenBSD/i386 and HPPA fixes, * NEWS: Note --enable-key-cache, the OpenBSD/i386 and HPPA fixes,

61
configure.ac
View File

@ -521,10 +521,12 @@ fi
AC_SUBST(SRVLIBS) AC_SUBST(SRVLIBS)
# 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. OpenLDAP in # libraries. -lldap [-llber [-lresolv]] is for older OpenLDAPs.
# general is terrible with creating weird dependencies. If all else # OpenLDAP, circa 1999, was terrible with creating weird dependencies.
# fails, the user can play guess-the-dependency by using something # This seems to have all been resolved, so I'm simplifying this code
# like ./configure LDAPLIBS="-Lfoo -lbar" # significantly. If all else fails, the user can play
# guess-the-dependency by using something like ./configure
# LDAPLIBS="-Lfoo -lbar"
if test "$try_ldap" = yes ; then if test "$try_ldap" = yes ; then
for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv"; do for MY_LDAPLIBS in ${LDAPLIBS+"$LDAPLIBS"} "-lldap" "-lldap -llber" "-lldap -llber -lresolv"; do
@ -536,56 +538,17 @@ if test "$try_ldap" = yes ; then
[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])
if test $gnupg_cv_func_ldap_init = no; then if test "$gnupg_cv_func_ldap_init" = yes ; then
AC_MSG_CHECKING([whether I can make LDAP be sane with lber.h])
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])
AC_MSG_RESULT([$gnupg_cv_func_ldaplber_init])
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
LDAPLIBS=$MY_LDAPLIBS LDAPLIBS=$MY_LDAPLIBS
GPGKEYS_LDAP="gpgkeys_ldap$EXEEXT" GPGKEYS_LDAP="gpgkeys_ldap$EXEEXT"
AC_MSG_CHECKING([whether LDAP supports ldap_get_option]) AC_CHECK_FUNCS(ldap_get_option ldap_set_option ldap_start_tls_s)
if test "$gnupg_cv_func_ldap_init" = yes ; then if test "$ac_cv_func_ldap_get_option" != yes ; then
AC_TRY_LINK([#include <ldap.h>],
[ldap_get_option((void *)0,0,(void *)0);],
[gnupg_cv_func_ldap_get_option=yes],
[gnupg_cv_func_ldap_get_option=no])
else
AC_TRY_LINK([#include <lber.h>
#include <ldap.h>],[ldap_get_option((void *)0,0,(void *)0);],
[gnupg_cv_func_ldap_get_option=yes],
[gnupg_cv_func_ldap_get_option=no])
fi
AC_MSG_RESULT([$gnupg_cv_func_ldap_get_option])
if test "$gnupg_cv_func_ldap_get_option" = yes ; then
AC_DEFINE(HAVE_LDAP_GET_OPTION,1,[Define if the LDAP library has ldap_get_option])
else
AC_MSG_CHECKING([whether LDAP supports ld_errno]) AC_MSG_CHECKING([whether LDAP supports ld_errno])
AC_TRY_LINK([#include <ldap.h>],[LDAP *ldap; ldap->ld_errno;],
if test "$gnupg_cv_func_ldap_init" = yes ; then [gnupg_cv_func_ldap_ld_errno=yes],
AC_TRY_COMPILE([#include <ldap.h>], [gnupg_cv_func_ldap_ld_errno=no])
[LDAP *ldap; ldap->ld_errno;],
[gnupg_cv_func_ldap_ld_errno=yes],
[gnupg_cv_func_ldap_ld_errno=no])
else
AC_TRY_LINK([#include <lber.h>
#include <ldap.h>],[LDAP *ldap; ldap->ld_errno;],
[gnupg_cv_func_ldap_ld_errno=yes],
[gnupg_cv_func_ldap_ld_errno=no])
fi
AC_MSG_RESULT([$gnupg_cv_func_ldap_ld_errno]) AC_MSG_RESULT([$gnupg_cv_func_ldap_ld_errno])
if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then if test "$gnupg_cv_func_ldap_ld_errno" = yes ; then