Fix configure detection code when --with-ldap and --enable-thread-safety

are both used.

Backpatch to 8.2.X.

Albe Laurenz

diff --git a/configure b/configure
index f55b761bd4d75d1a6ae1a8c7f220988cf963b636..1e2ff1475d0e135c309cf4f61e44f44fd84b059c 100755 (executable)
--- a/configure
+++ b/configure
@@ -17266,7 +17266,7 @@ if test "${ac_cv_lib_ldap_r_ldap_simple_bind+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap_r $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
+LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF

diff --git a/configure.in b/configure.in
index ad55d77db03d140c852673bc810f0c31b6752413..a27475a31ebffacfc4a14ac345a03b64d02d8aba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1130,7 +1130,7 @@ if test "$with_ldap" = yes ; then
       # on some platforms ldap_r fails to link without PTHREAD_LIBS
       AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],
                   [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],
-                  [$PTHREAD_LIBS $EXTRA_LDAP_LIBS])
+                  [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
       LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
     else
       LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"