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 a59b7ed63713745f346bc8e5a70d218fad3f6924..c34e4b3f2d65b798b49f0665c88f1b501f84c035 100644 (file)
--- 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 1fe174774746753570279794c8370245c9fe4b28..5c6f97c7949e2274b545efa39cc7ba29d8f53ddf 100644 (file)
--- 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 */