summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-12-14 21:49:54 +0000
committerTom Lane2006-12-14 21:49:54 +0000
commit1f09a857b7dd629d1251e07349277a6a99f44e72 (patch)
tree27c489077005abc9946bcaeb57926b9089c589ee
parent0bc8a5b6690da683d3cd7cca6108520c1f0ed10c (diff)
Make --with-ldap build on Unixware, per Olivier Prenant.
-rwxr-xr-xconfigure10
-rw-r--r--configure.in14
-rw-r--r--src/template/unixware3
3 files changed, 16 insertions, 11 deletions
diff --git a/configure b/configure
index c2a14d227a9..dc96e1ca41a 100755
--- a/configure
+++ b/configure
@@ -17185,7 +17185,7 @@ if test "${ac_cv_lib_ldap_ldap_bind+set}" = set; then
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
@@ -17256,7 +17256,7 @@ echo "$as_me: error: library 'ldap' is required for LDAP" >&2;}
{ (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
@@ -17266,7 +17266,7 @@ if test "${ac_cv_lib_ldap_r_ldap_simple_bind+set}" = set; then
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
@@ -17337,9 +17337,9 @@ echo "$as_me: error: library 'ldap_r' is required for LDAP" >&2;}
{ (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 9f42ff965ab..096f806060b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
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
@@ -1122,16 +1122,18 @@ AC_SUBST(PTHREAD_LIBS)
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 337d7dc2318..8173ae44e5f 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -32,3 +32,6 @@ __EOF__
# per report from Olivier PRENANT <[email protected]>
fi
+
+# Unixware's ldap library reportedly needs these too
+EXTRA_LDAP_LIBS="-llber -lresolv"