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

Commit946f62f

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 parent5763ef4 commit946f62f

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
@@ -12167,6 +12167,18 @@ else
1216712167
fi
1216812168

1216912169
LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
12170+
# This test is carried out against libldap.
12171+
for ac_func in ldap_initialize
12172+
do :
12173+
ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
12174+
if test "x$ac_cv_func_ldap_initialize" = xyes; then :
12175+
cat >>confdefs.h <<_ACEOF
12176+
#define HAVE_LDAP_INITIALIZE 1
12177+
_ACEOF
12178+
12179+
fi
12180+
done
12181+
1217012182
if test "$enable_thread_safety" = yes; then
1217112183
# Use ldap_r for FE if available, else assume ldap is thread-safe.
1217212184
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -12216,17 +12228,6 @@ fi
1221612228
else
1221712229
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
1221812230
fi
12219-
for ac_func in ldap_initialize
12220-
do :
12221-
ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
12222-
if test "x$ac_cv_func_ldap_initialize" = xyes; then :
12223-
cat >>confdefs.h <<_ACEOF
12224-
#define HAVE_LDAP_INITIALIZE 1
12225-
_ACEOF
12226-
12227-
fi
12228-
done
12229-
1223012231
else
1223112232
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
1223212233
$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
@@ -1270,6 +1270,8 @@ if test "$with_ldap" = yes ; then
12701270
[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
12711271
[$EXTRA_LDAP_LIBS])
12721272
LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
1273+
# This test is carried out against libldap.
1274+
AC_CHECK_FUNCS([ldap_initialize])
12731275
if test "$enable_thread_safety" = yes; then
12741276
# Use ldap_r for FE if available, else assume ldap is thread-safe.
12751277
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -1281,7 +1283,6 @@ if test "$with_ldap" = yes ; then
12811283
else
12821284
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
12831285
fi
1284-
AC_CHECK_FUNCS([ldap_initialize])
12851286
else
12861287
AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
12871288
LDAP_LIBS_FE="-lwldap32"

0 commit comments

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