Fix --enable-log-daemon-helpers auto-detect helpers

The code initializing default values and determining helper detection
was significantly different from other helpers detection logics. Combined
with rev.12786 logic changes resulted in the detection always failing.

Update the --enable-log-deemon-heleprs option to work identically to the
--enable-external-acl-helpers option.

diff --git a/configure.ac b/configure.ac
index f3ff7e28ba9a627439af48be28b9b996a3cc8007..f2e45c0a7c7b0e29e11deb75a68afcaf4b94bb52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1779,18 +1779,13 @@ AC_SUBST(AUTH_MODULES)
 AC_SUBST(AUTH_LIBS_TO_BUILD)
 
 dnl Select logging daemon helpers to build
-squid_opt_logdaemon_helpers="auto"
 AC_ARG_ENABLE(log-daemon-helpers,
   AS_HELP_STRING([--enable-log-daemon-helpers="list of helpers"],
                  [This option selects which logging daemon helpers to 
                   build and install as part of the normal build process
                   For a list of available helpers see the helpers/log_daemon
                   directory.]),[
-case "$enableval" in
-  yes) : ;;
-  no)  squid_opt_logdaemon_helpers="" ;;
-  *)   squid_opt_logdaemon_helpers="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`" ;;
-  esac
+#nothing to do, really
 ])
 m4_include([helpers/log_daemon/modules.m4])
 

diff --git a/helpers/log_daemon/modules.m4 b/helpers/log_daemon/modules.m4
index 72f89dc2a0ad8d1e95ef386cdd40f527b32f6dc8..9f0b5150b94e6a931bfe2e540cb4fb2243f1ec62 100644 (file)
--- a/helpers/log_daemon/modules.m4
+++ b/helpers/log_daemon/modules.m4
@@ -1,18 +1,21 @@
 # This file is supposed to run all the tests required to identify which
 # configured modules are able to be built in this environment
 
-# FIXME: de-duplicate $squid_opt_logdaemon_helpers list containing double entries.
+# FIXME: de-duplicate $enable_log_daemon_helpers list containing double entries.
 
 #define list of modules to build
-if test "x$squid_opt_logdaemon_helpers" = "xauto" ; then
-  squid_opt_logdaemon_helpers=""
-  SQUID_LOOK_FOR_MODULES([$srcdir/helpers/log_daemon],[squid_opt_logdaemon_helpers])
+if test "x${enable_log_daemon_helpers:=yes}" = "xyes" ;then
+  enable_log_daemon_helpers=""
+  SQUID_LOOK_FOR_MODULES([$srcdir/helpers/log_daemon],[enable_log_daemon_helpers])
+fi
+if test "x$enable_log_daemon_helpers" = "xnone" ; then
+  enable_log_daemon_helpers=""
 fi
 
 LOG_DAEMON_HELPERS=""
-squid_opt_logdaemon_helpers="`echo $squid_opt_logdaemon_helpers| sed -e 's/,/ /g;s/  */ /g'`"
-if test "x$squid_opt_logdaemon_helpers" = "x"; then
-  for helper in $squid_opt_logdaemon_helpers ; do
+enable_log_daemon_helpers="`echo $enable_log_daemon_helpers| sed -e 's/,/ /g;s/  */ /g'`"
+if test "x$enable_log_daemon_helpers" != "xno"; then
+  for helper in $enable_log_daemon_helpers ; do
     dir="$srcdir/helpers/log_daemon/$helper"
 
     # modules converted to autoconf macros already