1From 702bd881b66dc034e711c0ff47805f2da40b6e0d Mon Sep 17 00:00:00 2001 2From: Yue Tao <yue.tao@windriver.com> 3Date: Mon, 8 Aug 2016 16:04:33 +0800 4Subject: [PATCH] Set the SYSROOT for libxml2 header file to avoid host 5 contamination. 6 7Upstream-Status: Inappropriate [embedded specific] 8 9Signed-off-by: Yue Tao <yue.tao@windriver.com> 10Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 11 12--- 13 configure.ac | 12 ++++++------ 14 1 file changed, 6 insertions(+), 6 deletions(-) 15 16diff --git a/configure.ac b/configure.ac 17index 504a844..ff4688c 100644 18--- a/configure.ac 19+++ b/configure.ac 20@@ -931,15 +931,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then 21 dnl Find the main header and include path... 22 AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ 23 AC_CHECK_HEADERS([libxml/parser.h], [], [ 24- AC_MSG_NOTICE([Testing in /usr/include/libxml2]) 25+ AC_MSG_NOTICE([Testing in $SYSROOT/usr/include/libxml2]) 26 SAVED_CPPFLAGS="$CPPFLAGS" 27- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" 28+ CPPFLAGS="-I$SYSROOT/usr/include/libxml2 $CPPFLAGS" 29 unset ac_cv_header_libxml_parser_h 30- AC_CHECK_HEADERS([libxml/parser.h], [LIBXML2_CFLAGS="$LIBXML2_CFLAGS -I/usr/include/libxml2"], [ 31- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) 32- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" 33+ AC_CHECK_HEADERS([libxml/parser.h], [LIBXML2_CFLAGS="$LIBXML2_CFLAGS -I$SYSROOT/usr/include/libxml2"], [ 34+ AC_MSG_NOTICE([Testing in $SYSROOT/usr/local/include/libxml2]) 35+ CPPFLAGS="-I$SYSROOT/usr/local/include/libxml2 $SAVED_CPPFLAGS" 36 unset ac_cv_header_libxml_parser_h 37- AC_CHECK_HEADERS([libxml/parser.h], [LIBXML2_CFLAGS="$LIBXML2_CFLAGS -I/usr/local/include/libxml2"], [ 38+ AC_CHECK_HEADERS([libxml/parser.h], [LIBXML2_CFLAGS="$LIBXML2_CFLAGS -I$SYSROOT/usr/local/include/libxml2"], [ 39 AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) 40 ]) 41 ]) 42