diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 18 |
2 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2001-03-02 Chris Toshok <toshok@ximian.com> + + * configure.in: add logic to make sure we're building against OpenLDAP >= 2 + 2001-03-01 Christopher James Lahey <clahey@ximian.com> * Makefile.am (SUBDIRS), configure.in: Added views stuff. diff --git a/configure.in b/configure.in index b1296a1e23..43a5c285c5 100644 --- a/configure.in +++ b/configure.in @@ -157,10 +157,28 @@ if test x$enable_ldap = 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 +dnl * +dnl * check for openldap version 2.x, since 1.x doesn't have the schema stuff +dnl * + AC_MSG_CHECKING(if openldap is version 2.x) + AC_EGREP_CPP(yes, + [#include "ldap.h" + #if LDAP_VENDOR_VERSION > 20000 + yes + #endif + ], is_2x=yes, is_2x=no) + + if test x$is_2x = xyes; then + AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LDAP) AC_SUBST(LDAP_LIBS) msg_ldap=Yes + else + AC_MSG_ERROR(evolution requires OpenLDAP version >= 2) + fi else msg_ldap=No enable_ldap=no |