From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 21 Jan 2010 12:48:36 +0000 (+1300)
Subject: Fix build errors when XFF compounds with other features
X-Git-Tag: SQUID_3_2_0_1~452
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dae2bca2be262b5a4f594fa837bb863f23598a5;p=thirdparty%2Fsquid.git

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 d384893abd..bb14b69f11 100644
--- 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 e4a96ef0cd..fc6a9d4382 100644
--- 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"