From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 3 Sep 2009 12:24:52 +0000 (+1200)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_1_0_14~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1d2dd98c765b218030f0ab68021035419eef051;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Fixup libxml2 include magics, was failing when a configure cache was used
---

diff --git a/configure.in b/configure.in
index 2aa329ba1a..83691b368b 100644
--- a/configure.in
+++ b/configure.in
@@ -2198,10 +2198,12 @@ 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], [], [
-		CPPFLAGS="$SAVED_CPPFLAGS"
-		])
+	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"
+fi
 
 AC_C_CONST
 AC_C_BIGENDIAN