Commit25dc463

committed

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

are both used.Albe Laurenz

1 parentb1b9c36 commit25dc463Copy full SHA for 25dc463

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17609,7 +17609,7 @@ if test "${ac_cv_lib_ldap_r_ldap_simple_bind+set}" = set; then`
`17609`	`17609`	`echo $ECHO_N "(cached) $ECHO_C" >&6`
`17610`	`17610`	`else`
`17611`	`17611`	`ac_check_lib_save_LIBS=$LIBS`
`17612`		`-LIBS="-lldap_r $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"`
	`17612`	`+LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"`
`17613`	`17613`	`cat >conftest.$ac_ext <<_ACEOF`
`17614`	`17614`	`/* confdefs.h. */`
`17615`	`17615`	`_ACEOF`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.499 2007/01/28 03:50:33 momjian Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.500 2007/02/03 02:43:38 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1152,7 +1152,7 @@ if test "$with_ldap" = yes ; then`
`1152`	`1152`	`# on some platforms ldap_r fails to link without PTHREAD_LIBS`
`1153`	`1153`	`AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],`
`1154`	`1154`	`[AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],`
`1155`		`- [$PTHREAD_LIBS $EXTRA_LDAP_LIBS])`
	`1155`	`+ [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])`
`1156`	`1156`	`LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"`
`1157`	`1157`	`else`
`1158`	`1158`	`LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"`

Comments

(0)