Fix --disable-... options to default to be enabled.. (CARP, WCCP, IDENT, ..)

diff --git a/configure.in b/configure.in
index f59e1afab16a607a9c447546cc73c5e74673d409..865a1eea8604e9d87fbc38a8d5e0cb565e5bc94f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.301 2002/10/22 08:14:45 hno Exp $
+dnl  $Id: configure.in,v 1.302 2002/11/10 04:12:54 hno Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.301 $)dnl
+AC_REVISION($Revision: 1.302 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -265,15 +265,19 @@ AC_ARG_ENABLE(xmalloc-statistics,
   fi
 ])
 
+use_carp=1
 AC_ARG_ENABLE(carp,
 [  --disable-carp           Disable CARP support],
 [ if test "$enableval" = "no" ; then
     echo "CARP disabled"
-    AC_DEFINE(USE_CARP, 0, [Cache Array Routing Protocol])
-  else
-    AC_DEFINE(USE_CARP, 1)
+    use_carp=0
   fi
 ])      
+if test $use_carp = 1; then
+    AC_DEFINE(USE_CARP, 1, [Cache Array Routing Protocol])
+else
+    AC_DEFINE(USE_CARP, 1)
+fi
 
 AC_ARG_ENABLE(async-io,
 [  --enable-async-io[=N_THREADS]
@@ -484,15 +488,19 @@ AC_ARG_ENABLE(referer-log,
   fi
 ])
 
+use_wccp=1
 AC_ARG_ENABLE(wccp,  
 [  --disable-wccp          Disable Web Cache Coordination Protocol],
 [ if test "$enableval" = "no" ; then
     echo "Web Cache Coordination Protocol disabled"
-    AC_DEFINE(USE_WCCP, 0,[Define to enable WCCP])
-  else
-    AC_DEFINE(USE_WCCP, 1)
+    use_wccp=0
   fi
 ])      
+if test $use_wccp = 1; then
+    AC_DEFINE(USE_WCCP, 1,[Define to enable WCCP])
+else
+    AC_DEFINE(USE_WCCP, 0)
+fi
 
 AC_ARG_ENABLE(kill-parent-hack,
 [  --enable-kill-parent-hack
@@ -736,17 +744,21 @@ esac
 ])
 
 dnl Disable HTTP violations
+http_violations=1
 AC_ARG_ENABLE(http-violations,
 [  --disable-http-violations
                           This allows you to remove code which is known to
                           violate the HTTP protocol specification.],
 [ if test "$enableval" = "no" ; then
     echo "Disabling HTTP Violations"
-    AC_DEFINE(HTTP_VIOLATIONS, 0,[By default (for now anyway) Squid includes options which allows the cache administrator to violate the HTTP protocol specification in terms of cache behaviour.  Setting this to '0' will disable such code.])
-  else
-    AC_DEFINE(HTTP_VIOLATIONS, 1)
+    http_violations=0
   fi
 ])
+if test $http_violations = 1; then
+    AC_DEFINE(HTTP_VIOLATIONS, 1,[By default (for now anyway) Squid includes options which allows the cache administrator to violate the HTTP protocol specification in terms of cache behaviour.  Setting this to '0' will disable such code.])
+else
+    AC_DEFINE(HTTP_VIOLATIONS, 0)
+fi
 
 dnl Enable IP-Filter Transparent Proxy
 AC_ARG_ENABLE(ipf-transparent,
@@ -810,17 +822,21 @@ AC_ARG_ENABLE(leakfinder,
   fi
 ])
 
+use_ident=1
 AC_ARG_ENABLE(ident-lookups,
 [  --disable-ident-lookups
                           This allows you to remove code that performs
                           Ident (RFC 931) lookups.],
 [ if test "$enableval" = "no" ; then
     echo "Disabling Ident Lookups"
-    AC_DEFINE(USE_IDENT, 0,[Compile in support for Ident (RFC 931) lookups?  Enabled by default.])
-  else
-    AC_DEFINE(USE_IDENT, 1)
+    use_ident=0
   fi
 ])
+if test $use_ident = 1; then
+    AC_DEFINE(USE_IDENT, 1,[Compile in support for Ident (RFC 931) lookups?  Enabled by default.])
+else
+    AC_DEFINE(USE_IDENT, 0)
+fi
 
 AM_CONDITIONAL(USE_DNSSERVER, false)
 use_dnsserver=
@@ -1097,8 +1113,6 @@ AC_ARG_ENABLE(mempools,
 [ if test "$enableval" = "no" ; then
     echo "memPools disabled"
     AC_DEFINE(DISABLE_POOLS, 1, [Define if you have problems with memPools and want to disable Pools])
-  else
-    AC_DEFINE(DISABLE_POOLS, 0)
   fi
 ])