wine/. configure configure.ac

[Alexandre Julliard]

ChangeSet ID:	21556
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at winehq.org	2005/11/29 10:43:44

Modified files:
	.              : configure configure.ac 

Log message:
	Hans Leidekker <hans at it.vu.nl>
	Link to the reentrant version of libldap.

Patch: http://cvs.winehq.org/patch.py?id=21556

Old revision  New revision  Changes     Path
 1.719         1.720         +11 -11     wine/configure
 1.415         1.416         +4 -2       wine/configure.ac

Index: wine/configure
diff -u -p wine/configure:1.719 wine/configure:1.720
--- wine/configure:1.719	29 Nov 2005 16:43:44 -0000
+++ wine/configure	29 Nov 2005 16:43:44 -0000
@@ -9615,13 +9615,13 @@ LDAPLIBS=""
 
 if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
 then
-    echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
-echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
-if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
+    echo "$as_me:$LINENO: checking for ldap_initialize in -lldap_r" >&5
+echo $ECHO_N "checking for ldap_initialize in -lldap_r... $ECHO_C" >&6
+if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap  $LIBS"
+LIBS="-lldap_r $LIBPTHREAD $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9665,27 +9665,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_ldap_ldap_initialize=yes
+  ac_cv_lib_ldap_r_ldap_initialize=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_ldap_ldap_initialize=no
+ac_cv_lib_ldap_r_ldap_initialize=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
-if test $ac_cv_lib_ldap_ldap_initialize = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5
+echo "${ECHO_T}$ac_cv_lib_ldap_r_ldap_initialize" >&6
+if test $ac_cv_lib_ldap_r_ldap_initialize = yes; then
   echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
 echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6
 if test "${ac_cv_lib_lber_ber_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-llber  $LIBS"
+LIBS="-llber $LIBPTHREAD $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9748,7 +9748,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_LDAP 1
 _ACEOF
 
-             LDAPLIBS="-lldap -llber"
+             LDAPLIBS="-lldap_r -llber"
 fi
 
 fi
Index: wine/configure.ac
diff -u -p wine/configure.ac:1.415 wine/configure.ac:1.416
--- wine/configure.ac:1.415	29 Nov 2005 16:43:44 -0000
+++ wine/configure.ac	29 Nov 2005 16:43:44 -0000
@@ -545,10 +545,12 @@ dnl **** Check for OpenLDAP ***
 AC_SUBST(LDAPLIBS,"")
 if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
 then
-    AC_CHECK_LIB(ldap, ldap_initialize,
+    AC_CHECK_LIB(ldap_r, ldap_initialize,
         [AC_CHECK_LIB(lber, ber_init,
             [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
-             LDAPLIBS="-lldap -llber"])])
+             LDAPLIBS="-lldap_r -llber"],,
+             [$LIBPTHREAD])],,
+             [$LIBPTHREAD])
 fi
 
 dnl **** Check for FreeType 2 ****