Maintenance: Rework SASL detection

Author: kinkie

acinclude/squid-util.m4

@@ -332,30 +332,3 @@ AS_IF([test "$ac_res" != no],[
   $3],[$4])
 AS_VAR_POPDEF([ac_Search])dnl
 ])
-
-dnl Check for Cyrus SASL
-AC_DEFUN([SQUID_CHECK_SASL],[
-  squid_cv_check_sasl="auto"
-  AC_CHECK_HEADERS([sasl/sasl.h sasl.h])
-  AC_CHECK_LIB(sasl2,sasl_errstring,[LIBSASL="-lsasl2"],[
-    AC_CHECK_LIB(sasl,sasl_errstring,[LIBSASL="-lsasl"], [
-      squid_cv_check_sasl="no"
-    ])
-  ])
-  AS_IF([test "$squid_host_os" = "darwin"],[
-    AS_IF([test "$ac_cv_lib_sasl2_sasl_errstring" = "yes"],[
-      AC_DEFINE(HAVE_SASL_DARWIN,1,[Define to 1 if Mac Darwin without sasl.h])
-      echo "checking for MAC Darwin without sasl.h ... yes"
-      squid_cv_check_sasl="yes"
-    ],[
-      echo "checking for MAC Darwin without sasl.h ... no"
-      squid_cv_check_sasl="no"
-    ])
-  ])
-  AS_IF([test "x$squid_cv_check_sasl" = "xno"],[
-    AC_MSG_WARN([Neither SASL nor SASL2 found])
-  ],[
-    squid_cv_check_sasl="yes"
-  ])
-  AC_SUBST(LIBSASL)
-])

configure.ac

@@ -1200,13 +1200,24 @@ SQUID_CHECK_LIB_WORKS(ldap,[
     dnl TODO: use AC_CHECK_LIB
     LIBLDAP_LIBS="-lwldap32"
     AC_CHECK_HEADERS(winldap.h)
+    CXXFLAGS="${squid_arg_wno_deprecated_declarations} $CXXFLAGS"
   ])
   AC_CHECK_HEADERS(ldap.h lber.h)
   AC_CHECK_HEADERS(mozldap/ldap.h)
   SQUID_CHECK_LDAP_API
   SQUID_STATE_ROLLBACK(squid_ldap_state)
 ])
 
+SQUID_AUTO_LIB(sasl,[LIBSASL],[libsasl2])
+SQUID_CHECK_LIB_WORKS([sasl],[
+  SQUID_STATE_SAVE(sasl_state)
+  PKG_CHECK_MODULES([LIBSASL],[libsasl2],[:],[:])
+  CPPFLAGS="$LIBSASL_CFLAGS $CPPFLAGS"
+  LIBS="$LIBSASL_LIBS $LIBS"
+  AC_CHECK_HEADERS([sasl/sasl.h sasl.h])
+  SQUID_STATE_ROLLBACK(sasl_state)
+])
+
 SQUID_AUTO_LIB(systemd,[systemd API for start-up notification],[LIBSYSTEMD])
 SQUID_CHECK_LIB_WORKS(systemd,[
   SQUID_STATE_SAVE(squid_systemd_state)

src/acl/external/kerberos_ldap_group/Makefile.am

@@ -40,5 +40,5 @@ ext_kerberos_ldap_group_acl_LDADD = \
 	$(LIBHEIMDAL_KRB5_LIBS) \
 	$(LIBLDAP_LIBS) \
 	$(LIBMIT_KRB5_LIBS) \
-	$(LIBSASL) \
+	$(LIBSASL_LIBS) \
 	$(XTRA_LIBS)

src/acl/external/kerberos_ldap_group/required.m4

@@ -6,6 +6,7 @@
 ##
 
 AS_IF([test "x$LIBMIT_KRB5_LIBS" != "x" -o "x$LIBHEIMDAL_KRB5_LIBS" != "x" -o "x$LIBGSS_LIBS" != "x"],[
-  SQUID_CHECK_SASL
-  AS_IF([test "x$LIBLDAP_LIBS" != "x"],[BUILD_HELPER="kerberos_ldap_group"])
+  AS_IF([test "x$LIBSASL_LIBS" != "x"],[
+    BUILD_HELPER="kerberos_ldap_group"
+  ])
 ])

src/auth/basic/SASL/Makefile.am

@@ -15,7 +15,7 @@ basic_sasl_auth_SOURCES = \
 basic_sasl_auth_LDADD= \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(COMPAT_LIB) \
-	$(LIBSASL) \
+	$(LIBSASL_LIBS) \
 	$(XTRA_LIBS)
 
 EXTRA_DIST= \

src/auth/basic/SASL/required.m4

@@ -5,5 +5,6 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-SQUID_CHECK_SASL
-AS_IF([test "x$squid_cv_check_sasl" = "xyes"],[BUILD_HELPER="SASL"])
+AS_IF([test "x$LIBSASL_LIBS" != "x"],[
+    BUILD_HELPER="SASL"
+])