Summary: Adjust post-merge.

Keywords:

Set ESI to 0, not undefined when building without --enable-esi.
Fixup test suite Makefile to not test ESI unless ESI was built.

diff --git a/configure.in b/configure.in
index e446b6ebb4983d89cf71a783fc941d674db4d463..e12ca90ce78a9840e50a13ad8b540db569a6a547 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.336 2003/07/06 14:56:12 hno Exp $
+dnl  $Id: configure.in,v 1.337 2003/07/14 15:07:20 robertc Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0.DEVEL-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.336 $)dnl
+AC_REVISION($Revision: 1.337 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -553,6 +553,8 @@ if test "$ac_cv_use_esi" = "yes" ; then
   AC_DEFINE(ESI,1,[Compile the ESI processor and Surrogate header support])
   AM_CONDITIONAL(USE_ESI, true)
   XTRA_LIBS="$XTRA_LIBS -lexpat"
+else
+  AC_DEFINE(ESI,0,[Compile the ESI processor and Surrogate header support])
 fi
 
 dnl This is a developer only option. Developers know how to set defines

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 0ec8d6cd70852d2e0ff658ad697645b0133daa40..43cfc176b54aaf0f8b05ef7624d9816d91d416e3 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.cc,v 1.27 2003/07/11 01:40:36 robertc Exp $
+ * $Id: client_side_request.cc,v 1.28 2003/07/14 15:07:21 robertc Exp $
  * 
  * DEBUG: section 85    Client-side Request Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -555,7 +555,7 @@ clientInterpretRequestHeaders(clientHttpRequest * http)
     request_t *request = http->request;
     const HttpHeader *req_hdr = &request->header;
     int no_cache = 0;
-#if !defined(ESI) || defined(USE_USERAGENT_LOG) || defined(USE_REFERER_LOG)
+#if !(ESI) || defined(USE_USERAGENT_LOG) || defined(USE_REFERER_LOG)
 
     const char *str;
 #endif

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index adb81d3a0da7705ab7100390ba038a1d3db9194e..0be0a89ec9115069a65e492aa0acb554d4a6f2f9 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.14 2003/07/14 14:16:12 robertc Exp $
+#  $Id: Makefile.am,v 1.15 2003/07/14 15:07:22 robertc Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -13,6 +13,15 @@ INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/incl
 
 EXTRA_PROGRAMS = mem_node_test membanger splay tcp-banger2 rfc1738
 
+ESI_ALL_TESTS = \
+       ESIExpressions
+
+if USE_ESI
+  ESI_TESTS = $(ESI_ALL_TESTS)
+else
+  ESI_TESTS = 
+endif
+
 ## Sort by dependencies - test lowest layers first
 TESTS = debug \
        syntheticoperators \
@@ -24,11 +33,11 @@ TESTS = debug \
        mem_node_test\
        mem_hdr_test\
        http_range_test \
-       ESIExpressions
+       $(ESI_TESTS)
 
 ## Sort by alpha - any build failures are significant.
 check_PROGRAMS= debug \
-               ESIExpressions \
+               $(ESI_TESTS) \
                http_range_test \
                MemPoolTest\
                mem_node_test\