Fix mangled ESI configure logics

diff --git a/configure.ac b/configure.ac
index ea8bcf2592e19cf9ef22ff44c6a079fdd199007f..05644fd769749f91aeef880651897bf37a448e0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -927,24 +927,11 @@ if test "$use_esi" = "yes" ; then
       AC_MSG_ERROR([Required library libxml2 is not able to be found.])
     fi
   fi
-
-else
-  ac_cv_libxml2_include='no'
-      AC_MSG_NOTICE([Testing in /usr/include/libxml2])
-      AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="/usr/include/libxml2"], [])
-      if test "x$ac_cv_libxml2_include" = "xno"; then
-          AC_MSG_NOTICE([Testing in /usr/local/include/libxml2])
-          SAVED_CPPFLAGS="$CPPFLAGS"
-          CPPFLAGS="-I/usr/local/include/libxml2 $CPPFLAGS"
-          unset ac_cv_header_libxml_parser_h
-          AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="/usr/local/include/libxml2"], [])
-          CPPFLAGS="$SAVED_CPPFLAGS"
-      fi
-  if test "x$ac_cv_libxml2_include" != "xno"; then
-      SQUID_CXXFLAGS="-I$ac_cv_libxml2_include $SQUID_CXXFLAGS"
-      CPPFLAGS="-I$ac_cv_libxml2_include $CPPFLAGS"
-AC_SUBST(EXPATLIB)
+fi
+AM_CONDITIONAL(HAVE_LIBEXPAT, test $HAVE_LIBEXPAT = 1)
 AM_CONDITIONAL(HAVE_LIBXML2, test $HAVE_LIBXML2 = 1)
+AM_CONDITIONAL(USE_ESI, test "x$use_esi" = "xyes")
+AC_SUBST(EXPATLIB)
 AC_SUBST(XMLLIB)
 
 AM_CONDITIONAL(USE_ICAP_CLIENT, false)