aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2001-08-10 01:57:57 +0800
committerChris Toshok <toshok@src.gnome.org>2001-08-10 01:57:57 +0800
commit1844cac7c104dd820ade14493d87937a2c580264 (patch)
tree9237ba1af90af333c82fbd359a68b1f327d66e56
parent3a757979605c24899b07b270c789bab28f1aa8d7 (diff)
downloadgsoc2013-evolution-1844cac7c104dd820ade14493d87937a2c580264.tar.gz
gsoc2013-evolution-1844cac7c104dd820ade14493d87937a2c580264.tar.zst
gsoc2013-evolution-1844cac7c104dd820ade14493d87937a2c580264.zip
link statically with OpenLDAP.
2001-08-09 Chris Toshok <toshok@ximian.com> * configure.in: link statically with OpenLDAP. svn path=/trunk/; revision=11836
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d8ad5b3d03..59046d2734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-09 Chris Toshok <toshok@ximian.com>
+
+ * configure.in: link statically with OpenLDAP.
+
2001-08-09 Jon Trowbridge <trow@ximian.com>
* configure.in: Require GAL 0.10.99.2.
diff --git a/configure.in b/configure.in
index ea2dd4b47a..d07d6a27d2 100644
--- a/configure.in
+++ b/configure.in
@@ -406,20 +406,22 @@ if test "$msg_ldap" = yes; then
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
AC_CHECK_LIB(lber, ber_get_tag, [
- LDAP_LIBS="-llber $LDAP_LIBS"
+ LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
# libldap might depend on OpenSSL... We need to pull
# in the dependency libs explicitly here since we're
# not using libtool for the configure test.
if test -f $with_openldap/lib/libldap.la; then
LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
fi
- AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS",
+ AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS",
LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
if test -z "$LDAP_LIBS"; then
AC_MSG_ERROR(could not find OpenLDAP libraries)
+ else
+ LDAP_LIBS="-Wl,-Bstatic $LDAP_LIBS -Wl,-Bdynamic"
fi
AC_SUBST(LDAP_CFLAGS)