NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitebc346e

committed

Fix busted test for ldap_initialize.

Sigh ... I was expecting AC_CHECK_LIB to do something it didn't,namely update LIBS. This led to not finding ldap_initialize.Fix by moving the probe for ldap_initialize. In some sense thisis more correct anyway, since (at least for now) we care aboutwhether ldap_initialize exists in libldap not libldap_r.Per buildfarm member elver and local testing.Discussion:https://postgr.es/m/17083-a19190d9591946a7@postgresql.org

1 parent06883d5 commitebc346eCopy full SHA for ebc346e

File tree

2 files changed

+14

-12

lines changed

2 files changed

+14

-12

lines changed

`‎configure‎`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -12929,6 +12929,18 @@ else`
`12929`	`12929`	`fi`
`12930`	`12930`
`12931`	`12931`	`LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"`
	`12932`	`+ # This test is carried out against libldap.`
	`12933`	`+ for ac_func in ldap_initialize`
	`12934`	`+do :`
	`12935`	`+ ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"`
	`12936`	`+if test "x$ac_cv_func_ldap_initialize" = xyes; then :`
	`12937`	`+ cat >>confdefs.h <<_ACEOF`
	`12938`	`+#define HAVE_LDAP_INITIALIZE 1`
	`12939`	`+_ACEOF`
	`12940`	`+`
	`12941`	`+fi`
	`12942`	`+done`
	`12943`	`+`
`12932`	`12944`	`if test "$enable_thread_safety" = yes; then`
`12933`	`12945`	`# Use ldap_r for FE if available, else assume ldap is thread-safe.`
`12934`	`12946`	`# On some platforms ldap_r fails to link without PTHREAD_LIBS.`
`@@ -12978,17 +12990,6 @@ fi`
`12978`	`12990`	`else`
`12979`	`12991`	`LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"`
`12980`	`12992`	`fi`
`12981`		`- for ac_func in ldap_initialize`
`12982`		`-do :`
`12983`		`- ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"`
`12984`		`-if test "x$ac_cv_func_ldap_initialize" = xyes; then :`
`12985`		`- cat >>confdefs.h <<_ACEOF`
`12986`		`-#define HAVE_LDAP_INITIALIZE 1`
`12987`		`-_ACEOF`
`12988`		`-`
`12989`		`-fi`
`12990`		`-done`
`12991`		`-`
`12992`	`12993`	`else`
`12993`	`12994`	`{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5`
`12994`	`12995`	`$as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }`

`‎configure.ac‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1294,6 +1294,8 @@ if test "$with_ldap" = yes ; then`
`1294`	`1294`	`[AC_MSG_ERROR([library 'ldap' is required for LDAP])],`
`1295`	`1295`	`[$EXTRA_LDAP_LIBS])`
`1296`	`1296`	`LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"`
	`1297`	`+# This test is carried out against libldap.`
	`1298`	`+AC_CHECK_FUNCS([ldap_initialize])`
`1297`	`1299`	`if test "$enable_thread_safety" = yes; then`
`1298`	`1300`	`# Use ldap_r for FE if available, else assume ldap is thread-safe.`
`1299`	`1301`	`# On some platforms ldap_r fails to link without PTHREAD_LIBS.`
`@@ -1305,7 +1307,6 @@ if test "$with_ldap" = yes ; then`
`1305`	`1307`	`else`
`1306`	`1308`	`LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"`
`1307`	`1309`	`fi`
`1308`		`-AC_CHECK_FUNCS([ldap_initialize])`
`1309`	`1310`	`else`
`1310`	`1311`	`AC_CHECK_LIB(wldap32,ldap_bind,[],[AC_MSG_ERROR([library 'wldap32' is required for LDAP])])`
`1311`	`1312`	`LDAP_LIBS_FE="-lwldap32"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitebc346e

File tree

2 files changed

2 files changed

`‎configure‎`

`‎configure.ac‎`

0 commit comments