Author: Amos Jeffries + Henrik Nordstrom

Correct ESI library build options.

diff --git a/configure.in b/configure.in
index fdf051fa8c4f04ae34ae8fe3ba3a8de93a70b21a..5bf5241c7d5d6db134ff0b9d94b86003134f073d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -833,7 +833,7 @@ use_adaptation=no
 
 use_esi=yes
 AC_ARG_ENABLE(esi,
-  AS_HELP_STRING([--enable-esi],[Enable ESI for accelerators. Benefits from libexpat or libxml2.
+  AS_HELP_STRING([--enable-esi],[Enable ESI for accelerators. Benefits from expat or libxml2.
                   Enabling ESI will cause squid reverse proxies to be capable of the
                   Edge Acceleration Specification (www.esi.org).]),
              use_esi=$enableval, use_esi=no)
@@ -845,18 +845,18 @@ if test "$use_esi" = "yes" ; then
   AC_MSG_NOTICE([Enabling ESI processor and Surrogate header support.])
   AC_DEFINE(USE_SQUID_ESI,1,[Compile the ESI processor and Surrogate header support])
 
-  AC_ARG_WITH(expat, AS_HELP_STRING([--without-libexpat],[Do not use libexpat for ESI. Default: auto-detect]))
+  AC_ARG_WITH(expat, AS_HELP_STRING([--without-expat],[Do not use expat for ESI. Default: auto-detect]))
   if test "$with_expat" != "no" ; then
     AC_CHECK_LIB([expat], [main], [EXPATLIB="-lexpat"; HAVE_LIBEXPAT=1])
     AC_CHECK_HEADERS([expat.h])
     AC_DEFINE_UNQUOTED(HAVE_LIBEXPAT, $HAVE_LIBEXPAT, [Define to 1 if you have the expat library])
     if test "$with_expat" = "yes" && test "$HAVE_LIBEXPAT" != "1" ; then
-      AC_MSG_ERROR([Required library libexpat is not able to be found.])
+      AC_MSG_ERROR([Required library expat is not able to be found.])
     fi
   fi
 
-  AC_ARG_WITH(xml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect]))
-  if test "$with_xml2" != "no" ; then
+  AC_ARG_WITH(libxml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect]))
+  if test "$with_libxml2" != "no" ; then
     AC_CHECK_LIB([xml2], [main], [XMLLIB="-lxml2"; HAVE_LIBXML2=1])
     dnl Find the main header and include path...
     AC_CHECK_HEADERS([libxml/parser.h], [], [
@@ -873,7 +873,7 @@ if test "$use_esi" = "yes" ; then
     dnl Now that we know where to look find the other headers...
     AC_CHECK_HEADERS(libxml/HTMLparser.h libxml/HTMLtree.h)
     AC_DEFINE_UNQUOTED(HAVE_LIBXML2, $HAVE_LIBXML2, [Define to 1 if you have the libxml2 library])
-    if test "$with_xml2" = "yes" && test "$HAVE_LIBXML2" != "1" ; then
+    if test "$with_libxml2" = "yes" && test "$HAVE_LIBXML2" != "1" ; then
       AC_MSG_ERROR([Required library libxml2 is not able to be found.])
     fi
   fi

diff --git a/test-suite/buildtests/layer-05-nodeps-esi.opts b/test-suite/buildtests/layer-05-nodeps-esi.opts
index 5d7b751ff4ddcd05006392165c8b8e728627aeb0..eb52308c6c2f0aff29d9f53ca93dc8d6ff02e1e2 100644 (file)
--- a/test-suite/buildtests/layer-05-nodeps-esi.opts
+++ b/test-suite/buildtests/layer-05-nodeps-esi.opts
@@ -10,7 +10,7 @@ MAKETEST="distcheck"
 # NP: there must be no overlap in code for plugging the libraries in/out.
 #     this means we can test the absence of all in one run and save time.
 #
-OPTS="--enable-esi --without-expat --without-xml2"
+OPTS="--enable-esi --without-expat --without-libxml2"
 
 # Fix the distclean testing.
 export DISTCHECK_CONFIGURE_FLAGS="${OPTS}"