database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

Make --with-ldap build on Unixware, per Olivier Prenant.

Browse Source
This commit is contained in:
Tom Lane 2006-12-14 21:49:54 +00:00
parent 0bc8a5b669
commit 1f09a857b7
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -17185,7 +17185,7 @@ if test "${ac_cv_lib_ldap_ldap_bind+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lldap $LIBS" LIBS="-lldap $EXTRA_LDAP_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -17256,7 +17256,7 @@ echo "$as_me: error: library 'ldap' is required for LDAP" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
LDAP_LIBS_BE="-lldap" LDAP_LIBS_BE="-lldap $EXTRA_LDAP_LIBS"
if test "$enable_thread_safety" = yes; then if test "$enable_thread_safety" = yes; then
# on some platforms ldap_r fails to link without PTHREAD_LIBS # 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 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS 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 cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -17337,9 +17337,9 @@ echo "$as_me: error: library 'ldap_r' is required for LDAP" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
LDAP_LIBS_FE="-lldap_r" LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
else else
LDAP_LIBS_FE="-lldap" LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
fi fi
else else

14
configure.in
View File

@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. 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
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@ -1122,16 +1122,18 @@ AC_SUBST(PTHREAD_LIBS)
if test "$with_ldap" = yes ; then if test "$with_ldap" = yes ; then
_LIBS="$LIBS" _LIBS="$LIBS"
if test "$PORTNAME" != "win32"; then if test "$PORTNAME" != "win32"; then
AC_CHECK_LIB(ldap, ldap_bind, [], [AC_MSG_ERROR([library 'ldap' is required for LDAP])]) AC_CHECK_LIB(ldap, ldap_bind, [],
LDAP_LIBS_BE="-lldap" [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 if test "$enable_thread_safety" = yes; then
# on some platforms ldap_r fails to link without PTHREAD_LIBS # on some platforms ldap_r fails to link without PTHREAD_LIBS
AC_CHECK_LIB(ldap_r, ldap_simple_bind, [], AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],
[AC_MSG_ERROR([library 'ldap_r' is required for LDAP])], [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],
[$PTHREAD_LIBS]) [$PTHREAD_LIBS $EXTRA_LDAP_LIBS])
LDAP_LIBS_FE="-lldap_r" LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
else else
LDAP_LIBS_FE="-lldap" LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
fi fi
else else
AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])]) AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])

3
src/template/unixware
View File

@ -32,3 +32,6 @@ __EOF__
# per report from Olivier PRENANT <ohp@pyrenet.fr> # per report from Olivier PRENANT <ohp@pyrenet.fr>
fi fi
# Unixware's ldap library reportedly needs these too
EXTRA_LDAP_LIBS="-llber -lresolv"