diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-07-10 13:19:30 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-07-10 13:19:30 -0400 |
| commit | 9f6be2e79f88c65cef7cfeb0580e8b2ba74974f6 (patch) | |
| tree | b221952c598f24e1c2609e9b3c98ae5940687d6b | |
| parent | 44bd0126c70b5b90e8e2d604833a6476abbbffe6 (diff) | |
| download | postgresql-9f6be2e79f88c65cef7cfeb0580e8b2ba74974f6.tar.gz postgresql-9f6be2e79f88c65cef7cfeb0580e8b2ba74974f6.zip | |
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 this
is more correct anyway, since (at least for now) we care about
whether ldap_initialize exists in libldap not libldap_r.
Per buildfarm member elver and local testing.
Discussion: https://postgr.es/m/17083-a19190d9591946a7@postgresql.org
| -rwxr-xr-x | configure | 23 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 14 insertions, 12 deletions
diff --git a/configure b/configure index 4ef1d3a73d6..9f0018b3906 100755 --- a/configure +++ b/configure @@ -12929,6 +12929,18 @@ else fi LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS" + # This test is carried out against libldap. + for ac_func in ldap_initialize +do : + ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize" +if test "x$ac_cv_func_ldap_initialize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LDAP_INITIALIZE 1 +_ACEOF + +fi +done + if test "$enable_thread_safety" = yes; then # Use ldap_r for FE if available, else assume ldap is thread-safe. # On some platforms ldap_r fails to link without PTHREAD_LIBS. @@ -12978,17 +12990,6 @@ fi else LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS" fi - for ac_func in ldap_initialize -do : - ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize" -if test "x$ac_cv_func_ldap_initialize" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LDAP_INITIALIZE 1 -_ACEOF - -fi -done - else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5 $as_echo_n "checking for ldap_bind in -lwldap32... " >&6; } diff --git a/configure.ac b/configure.ac index 5f217c01e38..cfe0a6acc21 100644 --- a/configure.ac +++ b/configure.ac @@ -1294,6 +1294,8 @@ if test "$with_ldap" = yes ; then [AC_MSG_ERROR([library 'ldap' is required for LDAP])], [$EXTRA_LDAP_LIBS]) LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS" + # This test is carried out against libldap. + AC_CHECK_FUNCS([ldap_initialize]) if test "$enable_thread_safety" = yes; then # Use ldap_r for FE if available, else assume ldap is thread-safe. # On some platforms ldap_r fails to link without PTHREAD_LIBS. @@ -1305,7 +1307,6 @@ if test "$with_ldap" = yes ; then else LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS" fi - AC_CHECK_FUNCS([ldap_initialize]) else AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])]) LDAP_LIBS_FE="-lwldap32" |