git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index c2a14d227a98b927e8d04be79b622cfdca8f1170..dc96e1ca41a1e5405d5ba9328970a3af1ffdfac3 100755 (executable)

--- a/configure

+++ b/configure

echo $ECHO_N "(cached) $ECHO_C" >&6

else

ac_check_lib_save_LIBS=$LIBS

-LIBS="-lldap $LIBS"

+LIBS="-lldap $EXTRA_LDAP_LIBS $LIBS"

cat >conftest.$ac_ext <<_ACEOF

/* confdefs.h. */

_ACEOF

{ (exit 1); exit 1; }; }

fi

- LDAP_LIBS_BE="-lldap"

+ LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"

if test "$enable_thread_safety" = yes; then

# on some platforms ldap_r fails to link without PTHREAD_LIBS

echo $ECHO_N "(cached) $ECHO_C" >&6

else

ac_check_lib_save_LIBS=$LIBS

-LIBS="-lldap_r $PTHREAD_LIBS $LIBS"

+LIBS="-lldap_r $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"

cat >conftest.$ac_ext <<_ACEOF

/* confdefs.h. */

_ACEOF

{ (exit 1); exit 1; }; }

fi

- LDAP_LIBS_FE="-lldap_r"

+ LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"

else

- LDAP_LIBS_FE="-lldap"

+ LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"

fi

else

diff --git a/configure.in b/configure.in

index 9f42ff965ab7b81c611517e4f251d48f2e1d2047..096f806060beec392544a52b57d64535ab65e1f5 100644 (file)

--- a/configure.in

+++ b/configure.in

dnl Process this file with autoconf to produce a configure script.

-dnl $PostgreSQL: pgsql/configure.in,v 1.491 2006年12月02日 16:43:12 tgl Exp $

+dnl $PostgreSQL: pgsql/configure.in,v 1.492 2006年12月14日 21:49:54 tgl Exp $

dnl

dnl Developers, please strive to achieve this order:

dnl

if test "$with_ldap" = yes ; then

_LIBS="$LIBS"

if test "$PORTNAME" != "win32"; then

- AC_CHECK_LIB(ldap, ldap_bind, [], [AC_MSG_ERROR([library 'ldap' is required for LDAP])])

- LDAP_LIBS_BE="-lldap"

+ AC_CHECK_LIB(ldap, ldap_bind, [],

+ [AC_MSG_ERROR([library 'ldap' is required for LDAP])],

+ [$EXTRA_LDAP_LIBS])

+ LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"

if test "$enable_thread_safety" = yes; then

# on some platforms ldap_r fails to link without PTHREAD_LIBS

AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],

[AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],

- [$PTHREAD_LIBS])

- LDAP_LIBS_FE="-lldap_r"

+ [$PTHREAD_LIBS $EXTRA_LDAP_LIBS])

+ LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"

else

- LDAP_LIBS_FE="-lldap"

+ LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"

fi

else

AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])

diff --git a/src/template/unixware b/src/template/unixware

index 337d7dc2318f671563f50c4d235173e91261b19b..8173ae44e5f6edf807e2f7372e4e22393b2f4904 100644 (file)

--- a/src/template/unixware

+++ b/src/template/unixware

# per report from Olivier PRENANT <ohp@pyrenet.fr>

fi

+

+# Unixware's ldap library reportedly needs these too

+EXTRA_LDAP_LIBS="-llber -lresolv"