Improved SASL / SASL2 detection

Solaris and Darwin require -lsasl compile flag detection independent of
the .h include file naming. This may help other OS as well.

diff --git a/configure.ac b/configure.ac
index 980e73290d5ea72321086157e6a46d6aa50f6b88..772ac97e649080cf1ff7df038832ff530233f6b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2057,22 +2057,25 @@ AC_ARG_ENABLE(win32-service,
   fi
 ])
 
-
 dnl Check for Cyrus SASL
 if test "$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)
+    ])
+  ])
+  case "$squid_host_os" in
+    Darwin)
+      if test "$ac_cv_lib_sasl2_sasl_errstring" = "yes" ; then
+        AC_DEFINE(HAVE_SASL_DARWIN,1,[Define to 1 if Mac Darwin without sasl.h])
+        echo "checking for MAC Darwin without sasl.h ... yes"
+      else
+        echo "checking for MAC Darwin without sasl.h ... no"
+      fi
+      ;;
+  esac
+  AC_SUBST(LIBSASL)
 fi
 
 dnl Disable "unlinkd" code