Fix build errors when XFF compounds with other features

Some squid.conf options require XFF and other component wrappers to build
properly.

This fixes ICAP and Delay Pools clash which appeared in testing. Other
multiple-component wrapping can be done in identical fashion

diff --git a/src/cf.data.pre b/src/cf.data.pre
index d384893abd7e53158258cefe0ff8e4fedc877f60..bb14b69f11b20c00f8823a902daf5f28e34f0078 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -840,7 +840,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
@@ -3684,7 +3684,7 @@ DOC_END
 NAME: icap_uses_indirect_client
 COMMENT: on|off
 TYPE: onoff
-IFDEF: FOLLOW_X_FORWARDED_FOR
+IFDEF: FOLLOW_X_FORWARDED_FOR&&ICAP_CLIENT
 DEFAULT: on
 LOC: Adaptation::Icap::TheConfig.icap_uses_indirect_client
 DOC_START

diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index e4a96ef0cddb7b394eec4fd08b864eda7071b757..fc6a9d43823c80cf57db815de64e78ed22981837 100644 (file)
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -7,7 +7,8 @@ BEGIN {
        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["FOLLOW_X_FORWARDED_FOR&&DELAY_POOLS"]="--enable-follow-x-forwarded-for and --enable-delay-pools"
+       define["FOLLOW_X_FORWARDED_FOR&&ICAP_CLIENT"]="--enable-follow-x-forwarded-for and --enable-icap-client"
        define["HTTP_VIOLATIONS"]="--enable-http-violations"
        define["ICAP_CLIENT"]="--enable-icap-client"
        define["SQUID_SNMP"]="--enable-snmp"