Compatibility fix: improve detection of SASL libraries.

diff --git a/configure.in b/configure.in
index 8bcba74fe787a44df069aa8d4e31a3c472a67cc9..d3231ae6e0bd0d807a8731711f3752df8da4a7bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1979,19 +1979,13 @@ AC_ARG_ENABLE(win32-service,
 
 # Check for Cyrus SASL
 if test "$squid_require_sasl" = "yes"; then
-       AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
-       if test "$ac_cv_header_sasl_sasl_h" = "yes"; then
-               AC_MSG_NOTICE([using SASL2])
-               LIBSASL="-lsasl2"
-       else
-               if test "$ac_cv_header_sasl_h" = "yes"; then
-                       AC_MSG_NOTICE([using SASL])
-                       LIBSASL="-lsasl"
-               else
-                       AC_MSG_ERROR(Neither SASL nor SASL2 found)
-               fi
-       fi
-       AC_SUBST(LIBSASL)
+  AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
+  AC_CHECK_LIB(sasl2,sasl_errstring,[LIBSASL="-lsasl2"],[
+    AC_CHECK_LIB(sasl,sasl_errstring,[LIBSASL="-lsasl"], [
+      AC_MSG_ERROR(Neither SASL nor SASL2 found)
+    ])
+  ])
+  AC_SUBST(LIBSASL)
 fi
 
 # Disable "unlinkd" code