diff options
| author | Bruce Momjian | 2007-02-03 02:43:38 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2007-02-03 02:43:38 +0000 |
| commit | 25dc46334b99f3161d931a608fb49f6eced42065 (patch) | |
| tree | 8b6d66a49172fc69a5d79516c58322475d5d95fa | |
| parent | b1b9c364cc8b2e9d5ffdc9caa401381cb24fdfda (diff) | |
Fix configure detection code when --with-ldap and --enable-thread-safety
are both used.
Albe Laurenz
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure index 29e3eb710ef..87eeef3823f 100755 --- 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 7e55f67d135..35da4e67e46 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.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" |