1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00

* configure.ac: Autodetect wldap32 on Windoze.

This commit is contained in:
David Shaw 2004-11-06 13:18:13 +00:00
parent 4509cb7b1c
commit 42dfecadf7
2 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,7 @@
2004-11-06 David Shaw <dshaw@jabberwocky.com>
* configure.ac: Autodetect wldap32 on Windoze.
2004-11-04 David Shaw <dshaw@jabberwocky.com> 2004-11-04 David Shaw <dshaw@jabberwocky.com>
* README, configure.ac: Add --enable-backsigs to enable the * README, configure.ac: Add --enable-backsigs to enable the

View File

@ -456,7 +456,6 @@ case "${host}" in
have_dosish_system=yes have_dosish_system=yes
need_dlopen=no need_dlopen=no
try_gettext="no" try_gettext="no"
LDAPLIBS="-lwldap32"
;; ;;
i?86-emx-os2 | i?86-*-os2*emx ) i?86-emx-os2 | i?86-*-os2*emx )
# OS/2 with the EMX environment # OS/2 with the EMX environment
@ -592,12 +591,19 @@ AC_SUBST(SRVLIBS)
# LDAPLIBS="-Lfoo -lbar" # 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" "-lwldap32"; do
_ldap_save_libs=$LIBS _ldap_save_libs=$LIBS
LIBS="$MY_LDAPLIBS $NETLIBS $LIBS" LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"
AC_MSG_CHECKING([whether LDAP via \"$MY_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([
#ifdef _WIN32
#include <winsock2.h>
#include <winldap.h>
#else
#include <ldap.h>
#endif
],[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])