From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 10 Apr 2008 12:18:39 +0000 (+1200)
Subject: Wrap ESI headers away from .h dependency testing when module disabled.
X-Git-Tag: SQUID_3_1_0_1~49^2~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d18bed7022d18654ac842bd67e816a3182744ba;p=thirdparty%2Fsquid.git

Wrap ESI headers away from .h dependency testing when module disabled.

These mysteriously had passed all dependency tests on machines where
the XML libraries existed, despite ESI disabling. Only showed up when built
on a machine without Expat.
---

diff --git a/src/ESIExpatParser.h b/src/ESIExpatParser.h
index a59b7ed637..c34e4b3f2d 100644
--- a/src/ESIExpatParser.h
+++ b/src/ESIExpatParser.h
@@ -33,6 +33,8 @@
 #ifndef SQUID_ESIEXPATPARSER_H
 #define SQUID_ESIEXPATPARSER_H
 
+#if USE_SQUID_ESI
+
 #include "ESIParser.h"
 #include "expat.h"
 
@@ -62,4 +64,6 @@ private:
     ESIParserClient *theClient;
 };
 
+#endif /* USE_SQUID_ESI */
+
 #endif /* SQUID_ESIEXPATPARSER_H */
diff --git a/src/ESILibxml2Parser.h b/src/ESILibxml2Parser.h
index 1fe1747747..5c6f97c794 100644
--- a/src/ESILibxml2Parser.h
+++ b/src/ESILibxml2Parser.h
@@ -40,6 +40,8 @@
 #ifndef SQUID_ESILIBXML2PARSER_H
 #define SQUID_ESILIBXML2PARSER_H
 
+#if USE_SQUID_ESI
+
 #include "ESIParser.h"
 // workaround for definition of "free" that prevents include of
 // parser.h from libxml2 without errors
@@ -75,4 +77,6 @@ private:
     ESIParserClient *theClient;
 };
 
+#endif /* USE_SQUID_ESI */
+
 #endif /* SQUID_ESILIBXML2PARSER_H */