aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in11
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index eeb91e9311..0eb1b2887b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-01 Chris Toshok <toshok@ximian.com>
+
+ * configure.in: allow --enable/disable-ldap.
+
2001-02-01 Jason Leach <jasonleach@usa.net>
* tools/killev: Fix this script to make it work with Solaris.
diff --git a/configure.in b/configure.in
index f6a580fcc8..7c742734a3 100644
--- a/configure.in
+++ b/configure.in
@@ -147,16 +147,19 @@ AC_CHECK_HEADERS(db1/db.h)
dnl **************************************************
dnl * ldap related stuff.
dnl **************************************************
-AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")
-if test x$ac_cv_lib_lber_ber_get_tag = xyes; then
-AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)
+AC_ARG_ENABLE(ldap,
+[ --enable-ldap=[no/yes] Enable LDAP support in evolution],,enable_ldap=no)
+if test x$enable_ldap = xyes; then
+ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="-llber")
+ if test x$ac_cv_lib_lber_ber_get_tag = xyes; then
+ AC_CHECK_LIB(ldap, ldap_open, LDAP_LIBS="-lldap $LDAP_LIBS", ,-llber)
+ fi
fi
if test x$ac_cv_lib_ldap_ldap_open = xyes; then
AC_DEFINE(HAVE_LDAP)
AC_SUBST(LDAP_LIBS)
msg_ldap=Yes
else
- AC_MSG_WARN(no ldap support present)
msg_ldap=No
fi
AM_CONDITIONAL(ENABLE_LDAP, test x$ac_cv_lib_ldap_ldap_open = xyes)