From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 29 Jan 2010 11:56:09 +0000 (+1300)
Subject: Fix build errors when XFF compounds with other features
X-Git-Tag: SQUID_3_1_0_16~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=602324ca9c320d8430fe73989bbbff02172c2f28;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 2412d74119..e6b1d2b0b8 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -790,7 +790,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
@@ -3566,7 +3566,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 c241b5ab7c..86e5d80932 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"