From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Oct 2008 12:50:18 +0000 (+1300)
Subject: Update cf_gen_defines to match code
X-Git-Tag: SQUID_3_1_0_1~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97a616caddeda80c14fa822e006f2ee13106f2d1;p=thirdparty%2Fsquid.git

Update cf_gen_defines to match code
---

diff --git a/scripts/www/build-cfg-help.pl b/scripts/www/build-cfg-help.pl
index e3764a953e..aae44c00fc 100755
--- a/scripts/www/build-cfg-help.pl
+++ b/scripts/www/build-cfg-help.pl
@@ -56,7 +56,7 @@ my (%all_names);
 my ($comment);
 my (%defines);
 
-my $version = "3.0-PRE6";
+my $version = "3.1.0";
 my $verbose = '';
 my $path = "/tmp";
 my $format = "splithtml";
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 452e0c5910..f4df71cb3e 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -737,7 +737,7 @@ DOC_END
 NAME: delay_pool_uses_indirect_client
 COMMENT: on|off
 TYPE: onoff
-IFDEF: FOLLOW_X_FORWARDED_FOR && DELAY_POOLS
+IFDEF: FOLLOW_X_FORWARDED_FOR DELAY_POOLS
 DEFAULT: on
 LOC: Config.onoff.delay_pool_uses_indirect_client
 DOC_START
diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index e58e6f7898..837f58bdbe 100755
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -5,21 +5,29 @@ BEGIN {
 	print "*/"
 	print "static struct { const char *name; const char *enable; int defined;} defines[] = {"
 	define["DELAY_POOLS"]="--enable-delay-pools"
+	define["FOLLOW_X_FORWARDED_FOR"]="--enable-follow-x-forwarded-for"
+	define["FOLLOW_X_FORWARDED_FOR DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools"
 	define["HTTP_VIOLATIONS"]="--enable-http-violations"
+	define["ICAP_CLIENT"]="--enable-icap-client"
 	define["SQUID_SNMP"]="--enable-snmp"
+	define["USE_ADAPTATION"]="--enable-ecap or --enable-icap-client"
 	define["USE_CACHE_DIGESTS"]="--enable-cache-digests"
 	define["USE_DNSSERVERS"]="--disable-internal-dns"
 	define["!USE_DNSSERVERS"]="--enable-internal-dns"
+	define["USE_ECAP"]="--enable-ecap"
+	define["USE_ERR_LOCALES"]="--enable-auto-locale"
 	define["USE_HTCP"]="--enable-htcp"
 	define["USE_ICMP"]="--enable-icmp"
 	define["USE_IDENT"]="--enable-ident-lookups"
+	define["USE_LOADABLE_MODULES"]="--enable-loadable-modules"
 	define["USE_REFERER_LOG"]="--enable-referer-log"
+	define["USE_SQUID_ESI"]="--enable-esi"
 	define["USE_SSL"]="--enable-ssl"
 	define["USE_UNLINKD"]="--enable-unlinkd"
 	define["USE_USERAGENT_LOG"]="--enable-useragent-log"
 	define["USE_WCCP"]="--enable-wccp"
 	define["USE_WCCPv2"]="--enable-wccpv2"
-	define["ESI"]="--enable-esi"
+	define["USE_ZPH_QOS"]="--enable-zph-qos"
 }
 /^IFDEF:/ {
 	if (define[$2] != "")