OpenLDAP is now a required dependency. We will be removing all optional dependencies...

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 843f050a60aed520b6b7f46e21bbb2d1f836d7f5..8773625c739e03a971b7f9d39c0b80ec0bafdc9d 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      914             // This version
+#define REV_LEVEL      915             // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 760             // Oldest compatible export files
 #define LIBCITADEL_MIN 914             // Minimum required version of libcitadel

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 7faa9e52b0f9e5d191a52b5c35c8f2ffc1b15368..13327a9fb46d99a7765c13e38986bb794bd2739f 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [914], [http://www.citadel.org/])
+AC_INIT([Citadel], [915], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)
@@ -260,8 +260,6 @@ AC_ARG_WITH(ssl,
                fi
        ]
 )
-AC_ARG_WITH(with_ldap, [  --with-ldap             use OpenLDAP client library])
-AC_ARG_WITH(with_gc, [  --with-gc             use the Boehm-Demers-Weiser garbage collection library])
 
 if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
        db_dir="$with_db"
@@ -560,7 +558,6 @@ AC_CHECK_HEADER(libcitadel.h,
                AC_MSG_ERROR(libcitadel.h was not found or is not usable.  Please install libcitadel.)
        ]
 )
-
 CFLAGS="$saved_CFLAGS"
 
 
@@ -701,24 +698,21 @@ if test "x$with_db" != xno; then
 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_initialize,
-                       [ok_ldap=yes],,
-       )])
-fi
-
-if test "x$ok_ldap" = xyes ; then
-       SERVER_LIBS="-lldap $SERVER_LIBS"
-       AC_DEFINE(HAVE_LDAP, [], [define this if you have OpenLDAP client available])
-fi
-
-
-
-
+AC_CHECK_HEADER(ldap.h,
+       [AC_CHECK_LIB(ldap, ldap_initialize,
+               [
+                       SERVER_LIBS="-lldap $SERVER_LIBS"
+               ],
+               [
+                       AC_MSG_ERROR(OpenLDAP development library was not found and is required.  More info: http://www.citadel.org/doku.php/installation:start)
+               ]
+       ,
+       )],
+       [
+               AC_MSG_ERROR(OpenLDAP development headers were not found and are required.  More info: http://www.citadel.org/doku.php/installation:start)
+       ]
+)
 
 
 dnl Checks for the Expat XML parser.
@@ -1010,9 +1004,7 @@ fi
 
 
 echo ------------------------------------------------------------------------
-echo 'LDAP support:                    ' $ok_ldap
 echo 'Character set conversion support:' $ok_iconv
-echo 'Boehm-Demers-Weiser support:     ' $ok_gc
 echo 
 echo 'Note: if you are not using Linux, make sure you are using GNU make'
 echo '(gmake) to compile Citadel.'