system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-01 19:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Link to the reentrant version of libldap.

Browse source
This commit is contained in:
Hans Leidekker 2005-11-29 17:35:09 +01:00 committed by Alexandre Julliard
parent 83befb5d4d
commit ecfc2c15ff
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -9615,13 +9615,13 @@ LDAPLIBS=""
if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
then then
echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5 echo "$as_me:$LINENO: checking for ldap_initialize in -lldap_r" >&5
echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6 echo $ECHO_N "checking for ldap_initialize in -lldap_r... $ECHO_C" >&6
if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then if test "${ac_cv_lib_ldap_r_ldap_initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap $LIBS" LIBS="-lldap_r $LIBPTHREAD $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -9665,27 +9665,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
ac_cv_lib_ldap_ldap_initialize=yes ac_cv_lib_ldap_r_ldap_initialize=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ldap_ldap_initialize=no ac_cv_lib_ldap_r_ldap_initialize=no
fi fi
rm -f conftest.err conftest.$ac_objext \ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_r_ldap_initialize" >&5
echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6 echo "${ECHO_T}$ac_cv_lib_ldap_r_ldap_initialize" >&6
if test $ac_cv_lib_ldap_ldap_initialize = yes; then if test $ac_cv_lib_ldap_r_ldap_initialize = yes; then
echo "$as_me:$LINENO: checking for ber_init in -llber" >&5 echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6 echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6
if test "${ac_cv_lib_lber_ber_init+set}" = set; then if test "${ac_cv_lib_lber_ber_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-llber $LIBS" LIBS="-llber $LIBPTHREAD $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -9748,7 +9748,7 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_LDAP 1 #define HAVE_LDAP 1
_ACEOF _ACEOF
LDAPLIBS="-lldap -llber" LDAPLIBS="-lldap_r -llber"
fi fi
fi fi

6
configure.ac
View file

@ -545,10 +545,12 @@ dnl **** Check for OpenLDAP ***
AC_SUBST(LDAPLIBS,"") AC_SUBST(LDAPLIBS,"")
if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes" if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
then then
AC_CHECK_LIB(ldap, ldap_initialize, AC_CHECK_LIB(ldap_r, ldap_initialize,
[AC_CHECK_LIB(lber, ber_init, [AC_CHECK_LIB(lber, ber_init,
[AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment]) [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
LDAPLIBS="-lldap -llber"])]) LDAPLIBS="-lldap_r -llber"],,
[$LIBPTHREAD])],,
[$LIBPTHREAD])
fi fi
dnl **** Check for FreeType 2 **** dnl **** Check for FreeType 2 ****