From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 31 Jan 2011 01:10:17 +0000 (-0700)
Subject: Fix mangled ESI configure logics
X-Git-Tag: SQUID_3_1_11~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab03e322bceda12b423ca4a4b592fa39e9bb08f3;p=thirdparty%2Fsquid.git

Fix mangled ESI configure logics
---

diff --git a/configure.ac b/configure.ac
index ea8bcf2592..05644fd769 100644
--- 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)