Update SASL compat test to check for 1.5 compatibility

diff --git a/build/openldap.m4 b/build/openldap.m4
index 0fd68466f86d2c387f419d80208b83622c7c54c6..b6fb814e0bd3c0f76ba19d50952b6eafd7521993 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -1185,14 +1185,19 @@ AC_DEFUN(OL_FUNC_GETHOSTBYADDR_R_NARGS,
 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,[
+AC_DEFUN([OL_SASL_COMPAT],
+[AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
+       AC_EGREP_CPP(__sasl_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
+#if SASL_VERSION_MAJOR == 1  && SASL_VERSION_MINOR >= 5
+       char *__sasl_compat = "1.5.x okay";
+#elif SASL_VERSION_MAJOR == 2  && SASL_VERSION_MINOR > 1
+       __sasl_compat "2.2+ or better okay (we guess)";
+#elif SASL_VERSION_MAJOR == 2  && SASL_VERSION_MINOR == 1 \
+       && SASL_VERSION_STEP >=3
+       __sasl_compat = "2.1.3+ or better okay";
 #endif
-       ],      [ol_cv_sasl2_compat=yes], [ol_cv_sasl2_compat=no])])
+       ],      [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])])
 ])