Update cf_gen_defines to match code

diff --git a/scripts/www/build-cfg-help.pl b/scripts/www/build-cfg-help.pl
index e3764a953eaf5ab0d691d275b66c960de0425d6f..aae44c00fcda4b09113ba395507bdc8ab29db886 100755 (executable)
--- 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 452e0c591090b437ab35c5f66eeefbef3f1ee339..f4df71cb3e953f93ec9fd0c3aa5fe1d7533a160c 100644 (file)
--- 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 e58e6f78981ebaf20fa18c481ce1e860c956ec30..837f58bdbe25d64bf6758aaa951b8936a307ace2 100755 (executable)
--- 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] != "")