Require 2.1.3 or higher for Cyrus SASL 2

[openldap] / build / openldap.m4

diff --git a/build/openldap.m4 b/build/openldap.m4
index 1c94934622a926052ab1e55b1679bd1f4f65322a..0fd68466f86d2c387f419d80208b83622c7c54c6 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -312,8 +312,8 @@ dnl Try to locate appropriate library
 AC_DEFUN([OL_BERKELEY_DB_LINK],
 [ol_cv_lib_db=no
 OL_BERKELEY_DB_TRY(ol_cv_db_none)
-OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
 OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
+OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
 OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3])
 OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2])
 OL_BERKELEY_DB_TRY(ol_cv_db_db1,[-ldb1])
@@ -429,10 +429,8 @@ AC_DEFUN([OL_BDB_COMPAT],
 #      define DB_VERSION_MAJOR 1
 #endif
 
-/* require 3.3 or later */
-#if DB_VERSION_MAJOR > 3 
-       __db_version_compat
-#elif DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR >= 3
+/* require 4.0 or later */
+#if DB_VERSION_MAJOR >= 4 
        __db_version_compat
 #endif
        ],      [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
@@ -1185,3 +1183,16 @@ AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS,
   fi
 ])dnl
 dnl
+dnl --------------------------------------------------------------------
+dnl Check for Cyrus SASL version compatility, need 2.1.3 or newer
+AC_DEFUN([OL_SASL2_COMPAT],
+[AC_CACHE_CHECK([Cyrus SASL 2 library version], [ol_cv_sasl2_compat],[
+       AC_EGREP_CPP(__sasl2_version_compat,[
+#include <sasl/sasl.h>
+
+/* require 2.1.3 or later */
+#if SASL_VERSION_MAJOR >= 2 && (SASL_VERSION_MINOR > 1 || SASL_VERSION_STEP > 2)
+       __sasl2_version_compat
+#endif
+       ],      [ol_cv_sasl2_compat=yes], [ol_cv_sasl2_compat=no])])
+])