Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9fca23c

Browse files
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 parentf23a9b8 commit9fca23c

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 numberDiff line numberDiff line change
@@ -12544,6 +12544,18 @@ else
1254412544
fi
1254512545

1254612546
LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
12547+
# This test is carried out against libldap.
12548+
for ac_func in ldap_initialize
12549+
do :
12550+
ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
12551+
if test "x$ac_cv_func_ldap_initialize" = xyes; then :
12552+
cat >>confdefs.h <<_ACEOF
12553+
#define HAVE_LDAP_INITIALIZE 1
12554+
_ACEOF
12555+
12556+
fi
12557+
done
12558+
1254712559
if test "$enable_thread_safety" = yes; then
1254812560
# Use ldap_r for FE if available, else assume ldap is thread-safe.
1254912561
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -12593,17 +12605,6 @@ fi
1259312605
else
1259412606
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
1259512607
fi
12596-
for ac_func in ldap_initialize
12597-
do :
12598-
ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
12599-
if test "x$ac_cv_func_ldap_initialize" = xyes; then :
12600-
cat >>confdefs.h <<_ACEOF
12601-
#define HAVE_LDAP_INITIALIZE 1
12602-
_ACEOF
12603-
12604-
fi
12605-
done
12606-
1260712608
else
1260812609
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
1260912610
$as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }

‎configure.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,6 +1246,8 @@ if test "$with_ldap" = yes ; then
12461246
[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
12471247
[$EXTRA_LDAP_LIBS])
12481248
LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
1249+
# This test is carried out against libldap.
1250+
AC_CHECK_FUNCS([ldap_initialize])
12491251
if test "$enable_thread_safety" = yes; then
12501252
# Use ldap_r for FE if available, else assume ldap is thread-safe.
12511253
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -1257,7 +1259,6 @@ if test "$with_ldap" = yes ; then
12571259
else
12581260
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
12591261
fi
1260-
AC_CHECK_FUNCS([ldap_initialize])
12611262
else
12621263
AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
12631264
LDAP_LIBS_FE="-lwldap32"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp