Started unraveling ESI detection logic

diff --git a/configure.in b/configure.in
index e5079fd1f18732e0478f139139b7a45597426437..ee055128146f74db7710d3e6e0e45604ffa4f91c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -725,7 +725,7 @@ if test "$squid_opt_enable_storeio" = "auto"; then
   AC_MSG_CHECKING([for available StoreIO modules])
   SQUID_LOOK_FOR_MODULES([$srcdir/src/fs],[squid_storeio_module_candidates])
   # disable coss
-  squid_storeio_module_candidates=`ecoh $squid_storeio_module_candidates|sed 's/coss//'`
+  squid_storeio_module_candidates=`echo $squid_storeio_module_candidates|sed 's/coss//'`
   AC_MSG_RESULT([$squid_storeio_module_candidates])
 fi
 
@@ -850,55 +850,60 @@ dnl disable generic/common adaptation support by default
 use_adaptation=no
 
 use_esi=yes
+AH_TEMPLATE([USE_SQUID_ESI],
+            [Define to enable the ESI processor and Surrogate header support])
 AC_ARG_ENABLE(esi,
-  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)
+  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])
 HAVE_LIBEXPAT=0
 EXPATLIB=
 HAVE_LIBXML2=0
 XMLLIB=
 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-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 expat is not able to be found.])
-    fi
-  fi
+  AC_DEFINE(USE_SQUID_ESI,1,
+                 [Compile the ESI processor and Surrogate header support])
+else
+       AC_MSG_NOTICE([Disabling ESI processor])
+fi
 
-  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], [], [
-        SAVED_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
-        unset ac_cv_header_libxml_parser_h
-        AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include=yes], [])
-        CPPFLAGS="$SAVED_CPPFLAGS"
-        ])
-    if test "x$ac_cv_libxml2_include" = "xyes"; then
-        SQUID_CXXFLAGS="-I/usr/include/libxml2 $SQUID_CXXFLAGS"
-        CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
-    fi
-    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_libxml2" = "yes" && test "$HAVE_LIBXML2" != "1" ; then
-      AC_MSG_ERROR([Required library libxml2 is not able to be found.])
-    fi
+# ESI support libraries: expat
+AC_ARG_WITH(expat, AS_HELP_STRING([--without-expat],[Do not use expat for ESI. Default: auto-detect]))
+if test "$use_esi" = "yes" -a "$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 expat is not able to be found.])
   fi
+fi
 
-else
-  AC_MSG_NOTICE([Disabling ESI processor and Surrogate header support.])
+AC_ARG_WITH(libxml2, AS_HELP_STRING([--without-libxml2],[Do not use libxml2 for ESI. Default: auto-detect]))
+if test "$use_esi" = "yes" -a "$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], [], [
+      SAVED_CPPFLAGS="$CPPFLAGS"
+      CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
+      unset ac_cv_header_libxml_parser_h
+      AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include=yes], [])
+      CPPFLAGS="$SAVED_CPPFLAGS"
+      ])
+  if test "x$ac_cv_libxml2_include" = "xyes"; then
+      SQUID_CXXFLAGS="-I/usr/include/libxml2 $SQUID_CXXFLAGS"
+      CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
+  fi
+  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_libxml2" = "yes" && test "$HAVE_LIBXML2" != "1" ; then
+    AC_MSG_ERROR([Required library libxml2 is not able to be found.])
+  fi
 fi
+
 AM_CONDITIONAL(USE_ESI, test "$use_esi" = "yes")
 AM_CONDITIONAL(HAVE_LIBEXPAT, test $HAVE_LIBEXPAT = 1)
 AC_SUBST(EXPATLIB)