From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 6 Jun 2013 15:39:53 +0000 (+1200)
Subject: basic_sasl_auth: Fix helper auto-detection
X-Git-Tag: SQUID_3_4_0_1~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=586fa89792ff4194360d1673fd777a4f5e29e876;p=thirdparty%2Fsquid.git

basic_sasl_auth: Fix helper auto-detection

The helpers update in rev.12782 revealed SASL detection errors in the
use of ./configure script variables. This fixes the SASL library checks
and updates them to use the configure variable naming scheme.
---

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 972d3bf2a8..768bcd5d0d 100644
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -252,11 +252,11 @@ AS_VAR_POPDEF([ac_Search])dnl
 
 dnl Check for Cyrus SASL
 AC_DEFUN([SQUID_CHECK_SASL],[
-  squid_sasl_present="auto"
+  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_sasl_present="no"
+      squid_cv_check_sasl="no"
     ])
   ])
   case "$squid_host_os" in
@@ -264,15 +264,17 @@ AC_DEFUN([SQUID_CHECK_SASL],[
       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"
-        squid_sasl_present="yes"
+        squid_cv_check_sasl="yes"
       else
         echo "checking for MAC Darwin without sasl.h ... no"
-        squid_sasl_present="no"
+        squid_cv_check_sasl="no"
       fi
       ;;
   esac
-  if test "x$squid_sasl_present" != "yes"; then
+  if test "x$squid_cv_check_sasl" = "xno"; then
     AC_MSG_WARN([Neither SASL nor SASL2 found])
+  else
+    squid_cv_check_sasl="yes"
   fi
   AC_SUBST(LIBSASL)
 ])
diff --git a/helpers/basic_auth/SASL/required.m4 b/helpers/basic_auth/SASL/required.m4
index e8ccaec89b..a675fc6af9 100755
--- a/helpers/basic_auth/SASL/required.m4
+++ b/helpers/basic_auth/SASL/required.m4
@@ -1,6 +1,6 @@
 SQUID_CHECK_SASL
 
 # on success, add to the built modules list
-if test "x$squid_check_sasl" = "xyes"; then
+if test "x$squid_cv_check_sasl" = "xyes"; then
   BUILD_HELPER="SASL"
 fi