bootstrapped after renaming ESI -> SQUID_ESI

diff --git a/configure b/configure
index 12fefea5d0fdd35acb0ad1d86a1b5c03d417e9d3..248c78c23ce985cba04a88105eb0f44ad3a448a7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.485 .
+# From configure.in Revision.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for Squid Web Proxy 3.0.RC1-CVS.
 #
@@ -21288,7 +21288,7 @@ fi
 if test "$use_esi" = "yes" ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define ESI 1
+#define SQUID_ESI 1
 _ACEOF
 
 
@@ -21305,7 +21305,7 @@ fi
 else
 
 cat >>confdefs.h <<\_ACEOF
-#define ESI 0
+#define SQUID_ESI 0
 _ACEOF
 
 fi

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 8e578eda34adc227214996513308a880b42a9cc0..ae5d97886b26753534a390bae9cdacf1502595dc 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -39,9 +39,6 @@
 /* Define if you have problems with memPools and want to disable Pools. */
 #undef DISABLE_POOLS
 
-/* Compile the ESI processor and Surrogate header support */
-#undef ESI
-
 /* Enable Forw/Via database */
 #undef FORW_VIA_DB
 
@@ -870,6 +867,9 @@
 /* UDP send buffer size */
 #undef SQUID_DETECT_UDP_SO_SNDBUF
 
+/* Compile the ESI processor and Surrogate header support */
+#undef SQUID_ESI
+
 /* Maximum number of open filedescriptors */
 #undef SQUID_MAXFD