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

Commit9f6be2e

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 parent44bd012 commit9f6be2e

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
@@ -12929,6 +12929,18 @@ else
1292912929
fi
1293012930

1293112931
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+
1293212944
if test "$enable_thread_safety" = yes; then
1293312945
# Use ldap_r for FE if available, else assume ldap is thread-safe.
1293412946
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -12978,17 +12990,6 @@ fi
1297812990
else
1297912991
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
1298012992
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-
1299212993
else
1299312994
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
1299412995
$as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }

‎configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,8 @@ if test "$with_ldap" = yes ; then
12941294
[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
12951295
[$EXTRA_LDAP_LIBS])
12961296
LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
1297+
# This test is carried out against libldap.
1298+
AC_CHECK_FUNCS([ldap_initialize])
12971299
if test "$enable_thread_safety" = yes; then
12981300
# Use ldap_r for FE if available, else assume ldap is thread-safe.
12991301
# On some platforms ldap_r fails to link without PTHREAD_LIBS.
@@ -1305,7 +1307,6 @@ if test "$with_ldap" = yes ; then
13051307
else
13061308
LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
13071309
fi
1308-
AC_CHECK_FUNCS([ldap_initialize])
13091310
else
13101311
AC_CHECK_LIB(wldap32,ldap_bind,[],[AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
13111312
LDAP_LIBS_FE="-lwldap32"

0 commit comments

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