* Link to OpenLDAP client library (-lldap) and set HAVE_LDAP if present.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6994bc6c2a89c18f0e1e7ebbf06640f895a2fbf6..8f15d916eba61f436d2ca17657e2fe4738b996ba 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.1  2004/01/02 22:13:59  ajc
+ * Link to OpenLDAP client library (-lldap) and set HAVE_LDAP if present.
+
  Revision 614.0  2003/12/30 04:13:40  ajc
  * THIS IS 6.14
 
@@ -5210,4 +5213,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/acconfig.h b/citadel/acconfig.h
index a8a1d2b27088ab108a8076e1224126629e0b9044..6715e289b5282c31741cddcb78179b3737db4a0c 100644 (file)
--- a/citadel/acconfig.h
+++ b/citadel/acconfig.h
@@ -31,6 +31,9 @@
 /* define this if you have zlib compression available */
 #undef HAVE_ZLIB
 
+/* define this if you have OpenLDAP client available */
+#undef HAVE_LDAP
+
 /* define this if you have the libical calendaring library available */
 #undef HAVE_LIBICAL
 

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 6d56daae967bc6178d71de0dc267e39511106a73..48bbb5a6a867ecb9850dd24495a1e87b4bbb585a 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -33,6 +33,7 @@ AC_ARG_WITH(ssl,
 AC_ARG_WITH(ncurses, [  --without-ncurses       don't use ncurses])
 
 AC_ARG_WITH(with_zlib, [  --with-zlib             use zlib compression if present])
+AC_ARG_WITH(with_ldap, [  --with-ldap             use OpenLDAP client library])
 AC_ARG_WITH(with_libical, [  --with-libical          use libical calendaring library])
 AC_ARG_WITH(with_newt, [  --with-newt          use newt window library])
 
@@ -372,6 +373,22 @@ fi
 
 
 
+dnl Checks for the OpenLDAP client library.
+if test "x$with_ldap" != xno ; then
+       AC_CHECK_HEADERS(ldap.h,
+               [AC_CHECK_LIB(ldap, ldap_init,
+                       [ok_ldap=yes],,
+       )])
+fi
+
+if test "x$ok_ldap" = xyes ; then
+       SERVER_LIBS="-lldap $SERVER_LIBS"
+       AC_DEFINE(HAVE_LDAP)
+fi
+
+
+
+
 dnl Checks for the newt window library.
 if test "x$with_newt" != xno ; then
        AC_CHECK_HEADERS(newt.h,