Improved mempools configuration options

Refactored unlinkd configuration options.

diff --git a/configure.in b/configure.in
index 1ab80f2d573acc8a7711915a68502560c76154b5..c69c2a92221d096ad5caeb7424ea838078fd2c43 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1892,7 +1892,6 @@ AC_ARG_ENABLE(ntlm-fail-open,
   fi
 ])
 
-########### KK HERE ##########
 dnl Select external_acl helpers to build
 EXTERNAL_ACL_HELPERS=""
 squid_opt_external_acl_helpers="auto"
@@ -1999,14 +1998,16 @@ AC_ARG_WITH(valgrind-debug,
 ])
 
 dnl Disable "memPools" code
+squid_opt_enable_mempools=yes #default
 AC_ARG_ENABLE(mempools,
   AS_HELP_STRING([--disable-mempools],
                  [Disable memPools. Note that this option now simply sets the
                   default behaviour. Specific classes can override this at runtime, and
                   only lib/MemPool.c needs to be altered to change the squid-wide 
-                  default for all classes.]),
-[ squid_opt_enable_mempools=$enableval ] )
+                  default for all classes.]), [ 
 SQUID_YESNO([$squid_opt_enable_mempools],[--disable-mempools option takes no arguments])
+squid_opt_enable_mempools=$enableval 
+])
 # transform positive to negative value.
 AC_MSG_NOTICE([MemPools enabled: $squid_opt_enable_mempools])
 if test "$squid_opt_enable_mempools" = "yes" ; then
@@ -2045,27 +2046,16 @@ if test "$require_sasl" = "yes"; then
        AC_SUBST(LIBSASL)
 fi
 
-dnl Disable "unlinkd" code
+# Disable "unlinkd" code
+squid_opt_enable_unlinkd=yes
 AC_ARG_ENABLE(unlinkd,
   AS_HELP_STRING([--disable-unlinkd],[Do not use unlinkd]),
-[ if test "$enableval" = "no" ; then
-    use_unlinkd=no
-  else
-    use_unlinkd=yes
-  fi
-],[
-    # Here we should probably use some magic depending on the selected
-    # storage models
-    use_unlinkd=yes
-])
-if test "$use_unlinkd" = "yes"; then
-    AC_MSG_NOTICE([unlinkd enabled])
-    AC_DEFINE(USE_UNLINKD,1,[Define this if unlinkd is required (strongly recommended for ufs storage type)])
-    AM_CONDITIONAL(ENABLE_UNLINKD, true)
-else
-    AC_MSG_NOTICE([unlinkd disabled])
-    AM_CONDITIONAL(ENABLE_UNLINKD, false)
-fi
+[ SQUID_YESNO([$enableval],[unrecognized argument to --disable-unlinkd: $enableval])
+squid_opt_enable_unlinkd=$enableval
+])
+AC_MSG_NOTICE([unlinkd enabled: $squid_opt_enable_unlinkd])
+SQUID_DEFINE_UNQUOTED([USE_UNLINKD],$squid_opt_enable_unlinkd,[Enable useage of unlinkd])
+AM_CONDITIONAL(ENABLE_UNLINKD,test $squid_opt_enable_unlinkd = "yes")
 
 dnl Enable backtraces on fatal errors
 AC_ARG_ENABLE(stacktraces,