From 554d3a683cd5c3f71deae96896ad84b24f169f5a Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 3 Feb 2007 02:47:35 +0000
Subject: [PATCH] Fix configure detection code when --with-ldap and
 --enable-thread-safety are both used.

Backpatch to 8.2.X.

Albe Laurenz
---
 configure    | 2 +-
 configure.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index f55b761bd4d..1e2ff1475d0 100755
--- 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 ac603ad3218..b294b2be19c 100644
--- 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.490.2.3 2007/02/02 00:14:21 tgl Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.490.2.4 2007/02/03 02:47:35 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -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"