From 53257cf037e254a55259ed6b0249248f034ecf0b Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 13 May 2002 20:16:10 +0000 Subject: [PATCH] Update SASL compat test to check for 1.5 compatibility --- build/openldap.m4 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build/openldap.m4 b/build/openldap.m4 index 0fd68466f8..b6fb814e0b 100644 --- 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 /* 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])]) ]) -- 2.39.5