summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-07-10 13:19:31 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-07-10 13:19:31 -0400
commitebc346e5bb72b2a68258f1be8791f2b90191cd38 (patch)
treee567a0f2770674b49ee7e102b3b26109ff9c733c /configure
parent06883d58ff29cf4fb8c32fd13ce9947796b9fb0f (diff)
downloadpostgresql-ebc346e5bb72b2a68258f1be8791f2b90191cd38.tar.gz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure23
1 files changed, 12 insertions, 11 deletions
diff --git a/configure b/configure
index 50147ba144..030a5a2d42 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; }