From 03f5ee27a4e5d8a43e88340a56adb51fcd127238 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 2 Jan 2004 22:13:59 +0000 Subject: [PATCH] * Link to OpenLDAP client library (-lldap) and set HAVE_LDAP if present. --- citadel/ChangeLog | 4 +++- citadel/acconfig.h | 3 +++ citadel/configure.ac | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 6994bc6c2..8f15d916e 100644 --- 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 Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/acconfig.h b/citadel/acconfig.h index a8a1d2b27..6715e289b 100644 --- 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 6d56daae9..48bbb5a6a 100644 --- 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, -- 2.39.2