From: wessels <>
Date: Thu, 13 Jul 2000 14:38:36 +0000 (+0000)
Subject: DW:
X-Git-Tag: SQUID_3_0_PRE1~1900
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d918041439aac15365b0508190ff6401bc792d80;p=thirdparty%2Fsquid.git

DW:
 - Brad <brad@comstyle.com> pointed out that some configure --enable
   descriptions don't match the arg names.  They were using "_" instead
   of "-".  This patch makes all descriptions use "-", or at least
   match the argument.
---

diff --git a/configure b/configure
index 07f88a347d..62c1d3e439 100755
--- a/configure
+++ b/configure
@@ -1114,7 +1114,7 @@ if test "${enable_gnuregex+set}" = set; then
 fi
 
 
-# Check whether --enable-xmalloc_debug or --disable-xmalloc_debug was given.
+# Check whether --enable-xmalloc-debug or --disable-xmalloc-debug was given.
 if test "${enable_xmalloc_debug+set}" = set; then
   enableval="$enable_xmalloc_debug"
    if test "$enableval" = "yes" ; then
@@ -1128,7 +1128,7 @@ EOF
 fi
 
 
-# Check whether --enable-xmalloc_debug_trace or --disable-xmalloc_debug_trace was given.
+# Check whether --enable-xmalloc-debug-trace or --disable-xmalloc-debug-trace was given.
 if test "${enable_xmalloc_debug_trace+set}" = set; then
   enableval="$enable_xmalloc_debug_trace"
    if test "$enableval" = "yes" ; then
@@ -1146,7 +1146,7 @@ EOF
 fi
 
 
-# Check whether --enable-xmalloc_statistics or --disable-xmalloc_statistics was given.
+# Check whether --enable-xmalloc-statistics or --disable-xmalloc-statistics was given.
 if test "${enable_xmalloc_statistics+set}" = set; then
   enableval="$enable_xmalloc_statistics"
    if test "$enableval" = "yes" ; then
@@ -1276,7 +1276,7 @@ if test "${enable_heap_replacement+set}" = set; then
 fi
 
 
-# Check whether --enable-removal_policies or --disable-removal_policies was given.
+# Check whether --enable-removal-policies or --disable-removal-policies was given.
 if test "${enable_removal_policies+set}" = set; then
   enableval="$enable_removal_policies"
    case $enableval in
@@ -1322,7 +1322,7 @@ fi
 
 
 
-# Check whether --enable-delay_pools or --disable-delay_pools was given.
+# Check whether --enable-delay-pools or --disable-delay-pools was given.
 if test "${enable_delay_pools+set}" = set; then
   enableval="$enable_delay_pools"
    if test "$enableval" = "yes" ; then
@@ -1352,7 +1352,7 @@ EOF
 fi
      
 
-# Check whether --enable-useragent_log or --disable-useragent_log was given.
+# Check whether --enable-useragent-log or --disable-useragent-log was given.
 if test "${enable_useragent_log+set}" = set; then
   enableval="$enable_useragent_log"
    if test "$enableval" = "yes" ; then
@@ -1399,7 +1399,7 @@ EOF
 fi
       
 
-# Check whether --enable-kill_parent_hack or --disable-kill_parent_hack was given.
+# Check whether --enable-kill-parent-hack or --disable-kill-parent-hack was given.
 if test "${enable_kill_parent_hack+set}" = set; then
   enableval="$enable_kill_parent_hack"
    if test "$enableval" = "yes" ; then
@@ -1434,7 +1434,7 @@ fi
 
 
 
-# Check whether --enable-time_hack or --disable-time_hack was given.
+# Check whether --enable-time-hack or --disable-time-hack was given.
 if test "${enable_time_hack+set}" = set; then
   enableval="$enable_time_hack"
    if test "$enableval" = "yes" ; then
@@ -1448,7 +1448,7 @@ EOF
 fi
 
 
-# Check whether --enable-cachemgr_hostname or --disable-cachemgr_hostname was given.
+# Check whether --enable-cachemgr-hostname or --disable-cachemgr-hostname was given.
 if test "${enable_cachemgr_hostname+set}" = set; then
   enableval="$enable_cachemgr_hostname"
     case $enableval in
@@ -1474,7 +1474,7 @@ EOF
 fi
 
 
-# Check whether --enable-arp_acl or --disable-arp_acl was given.
+# Check whether --enable-arp-acl or --disable-arp-acl was given.
 if test "${enable_arp_acl+set}" = set; then
   enableval="$enable_arp_acl"
     if test "$enableval" = "yes" ; then
diff --git a/configure.in b/configure.in
index 79c2213932..1ece5a04f6 100644
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ 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.196 2000/07/13 08:35:46 wessels Exp $
+dnl  $Id: configure.in,v 1.197 2000/07/13 08:38:36 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.196 $)dnl
+AC_REVISION($Revision: 1.197 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -204,7 +204,7 @@ AC_ARG_ENABLE(gnuregex,
 [  --enable-gnuregex       Compile GNUregex],
 [USE_GNUREGEX=$enableval])
 
-AC_ARG_ENABLE(xmalloc_debug,
+AC_ARG_ENABLE(xmalloc-debug,
 [  --enable-xmalloc-debug  Do some simple malloc debugging],
 [ if test "$enableval" = "yes" ; then
     echo "Malloc debugging enabled"
@@ -212,7 +212,7 @@ AC_ARG_ENABLE(xmalloc_debug,
   fi
 ])
 
-AC_ARG_ENABLE(xmalloc_debug_trace,
+AC_ARG_ENABLE(xmalloc-debug-trace,
 [  --enable-xmalloc-debug-trace
                           Detailed trace of memory allocations],
 [ if test "$enableval" = "yes" ; then
@@ -222,7 +222,7 @@ AC_ARG_ENABLE(xmalloc_debug_trace,
   fi
 ])
 
-AC_ARG_ENABLE(xmalloc_statistics,
+AC_ARG_ENABLE(xmalloc-statistics,
 [  --enable-xmalloc-statistics
                           Show malloc statistics in status page],
 [ if test "$enableval" = "yes" ; then
@@ -336,7 +336,7 @@ AC_ARG_ENABLE(heap-replacement,
   fi
 ])
 
-AC_ARG_ENABLE(removal_policies,
+AC_ARG_ENABLE(removal-policies,
 [  --enable-removal-policies=\"list of policies\"
                           Build support for the list of removal policies.
                           The default is only to build the "lru" module.
@@ -377,7 +377,7 @@ AC_ARG_ENABLE(icmp,
 ])
 AC_SUBST(OPT_PINGER_EXE)
 
-AC_ARG_ENABLE(delay_pools,
+AC_ARG_ENABLE(delay-pools,
 [  --enable-delay-pools    Enable delay pools to limit bandwith usage],
 [ if test "$enableval" = "yes" ; then
     echo "Delay pools enabled"
@@ -395,7 +395,7 @@ AC_ARG_ENABLE(mem-gen-trace,
   fi    
 ])     
 
-AC_ARG_ENABLE(useragent_log,
+AC_ARG_ENABLE(useragent-log,
 [  --enable-useragent-log  Enable logging of User-Agent header],
 [ if test "$enableval" = "yes" ; then
     echo "User-Agent logging enabled"
@@ -421,7 +421,7 @@ AC_ARG_ENABLE(wccp,
   fi
 ])      
 
-AC_ARG_ENABLE(kill_parent_hack,
+AC_ARG_ENABLE(kill-parent-hack,
 [  --enable-kill-parent-hack
                           Kill parent on shutdown],
 [ if test "$enableval" = "yes" ; then
@@ -445,7 +445,7 @@ AC_SUBST(SNMPLIB)
 AC_SUBST(SNMP_OBJS)
 AC_SUBST(makesnmplib)
 
-AC_ARG_ENABLE(time_hack,
+AC_ARG_ENABLE(time-hack,
 [  --enable-time-hack      Update internal timestamp only once per second],
 [ if test "$enableval" = "yes" ; then
     echo "Update internal timestamp only once per second"
@@ -453,7 +453,7 @@ AC_ARG_ENABLE(time_hack,
   fi
 ])
 
-AC_ARG_ENABLE(cachemgr_hostname,
+AC_ARG_ENABLE(cachemgr-hostname,
 [  --enable-cachemgr-hostname[=hostname]
                           Make cachemgr.cgi default to this host],
 [  case $enableval in
@@ -471,7 +471,7 @@ AC_ARG_ENABLE(cachemgr_hostname,
    esac
 ])
 
-AC_ARG_ENABLE(arp_acl,
+AC_ARG_ENABLE(arp-acl,
 [  --enable-arp-acl        Enable use of ARP ACL lists (ether address)],
 [  if test "$enableval" = "yes" ; then
      echo "ARP ACL lists enabled (ether address)"