From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 25 Dec 2010 21:47:09 +0000 (+0000)
Subject: [packages] rrdtool: extend host include fix to cover acinclude.m4 as well
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=30163ff9c284a2e7d7f0eb19838c2ac6cfe55e7f;p=packages.git

[packages] rrdtool: extend host include fix to cover acinclude.m4 as well


git-svn-id: svn://svn.openwrt.org/openwrt/packages@24826 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch b/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
index 328487729..507a0e971 100644
--- a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
+++ b/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index d3ab0a5..ba60d52 100755
 --- a/configure
 +++ b/configure
 @@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -22,3 +20,15 @@ index d3ab0a5..ba60d52 100755
    { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
  echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
  if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL],
+  ex_check_save_LIBS=${LIBS}
+  ex_check_save_CPPFLAGS=${CPPFLAGS}
+  ex_check_save_LDFLAGS=${LDFLAGS}
+- if test "x$7" != "x"; then
+-   CPPFLAGS="$CPPFLAGS -I$7"
+- fi
+  dnl try compiling naked first
+  AC_CHECK_LIB($1,$2, [
+     AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])