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

are both used.

Albe Laurenz

diff --git a/configure b/configure
index 29e3eb710efd8b17dde168d1e56dbf13eb34be7a..87eeef3823f12150d855cbeeb08ab9e3ac8117e2 100755 (executable)
--- a/configure
+++ b/configure
@@ -17609,7 +17609,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 7e55f67d1355fde38baef54948d1313022c6bb52..35da4e67e46808ab875ddf0f878b2938abee4909 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.499 2007/01/28 03:50:33 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.500 2007/02/03 02:43:38 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1152,7 +1152,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"