From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 27 Aug 2009 17:05:03 +0000 (+0200)
Subject: Fixup libxml2 include magics, was failing when a configure cache was used
X-Git-Tag: SQUID_3_2_0_1~757
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15c21a9a422a528d7c9c1a886df2c155ad07e39c;p=thirdparty%2Fsquid.git

Fixup libxml2 include magics, was failing when a configure cache was used
---

diff --git a/configure.in b/configure.in
index 2bd0d901bf..dc6030343c 100644
--- a/configure.in
+++ b/configure.in
@@ -2221,10 +2221,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