mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-24 18:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
are both used.

Backpatch to 8.2.X.

Albe Laurenz
This commit is contained in:
Bruce Momjian 2007-02-03 02:47:35 +00:00
parent 3714d82f76
commit 554d3a683c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

4
configure.in
View File

@ -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"