gnupg (ChangeLog configure.ac)

[cvs user dshaw]

    Date: Saturday, November 6, 2004 @ 14:18:13
  Author: dshaw
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac

* configure.ac: Autodetect wldap32 on Windoze.


--------------+
 ChangeLog    |    4 ++++
 configure.ac |   14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.219 gnupg/ChangeLog:1.220
--- gnupg/ChangeLog:1.219	Fri Nov  5 04:45:06 2004
+++ gnupg/ChangeLog	Sat Nov  6 14:18:13 2004
@@ -1,3 +1,7 @@
+2004-11-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* configure.ac: Autodetect wldap32 on Windoze.
+
 2004-11-04  David Shaw  <dshaw at jabberwocky.com>
 
 	* README, configure.ac: Add --enable-backsigs to enable the
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.111 gnupg/configure.ac:1.112
--- gnupg/configure.ac:1.111	Fri Nov  5 04:45:06 2004
+++ gnupg/configure.ac	Sat Nov  6 14:18:13 2004
@@ -19,7 +19,7 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.111 $)dnl
+dnlAC_REVISION($Revision: 1.112 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.7.9"
@@ -456,7 +456,6 @@
         have_dosish_system=yes
         need_dlopen=no
         try_gettext="no"
-	LDAPLIBS="-lwldap32"
         ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         # OS/2 with the EMX environment
@@ -592,12 +591,19 @@
 # LDAPLIBS="-Lfoo -lbar"
 
 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
     LIBS="$MY_LDAPLIBS $NETLIBS $LIBS"
 
     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])
     AC_MSG_RESULT([$gnupg_cv_func_ldap_init])