X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=acinclude.m4;h=6243c21182726a7dc07b3aace4579bcc30288f46;hb=0bac2398d14f8a11c3430872c2503b93a596ea66;hp=6ada55c5efcd91e78f04c77a98245491163be52c;hpb=e117f6452baa5a8d28156c279840a9f6d8f03d30;p=rrdtool.git

diff --git a/acinclude.m4 b/acinclude.m4
index 6ada55c..6243c21 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -21,7 +21,7 @@ AC_DEFUN([EX_CHECK_ALL],
  ex_check_save_CPPFLAGS=${CPPFLAGS}
  ex_check_save_LDFLAGS=${LDPFLAGS}
  if test "x$7" != "x"; then
-   CPPFLAGS="-I$7 $CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS -I$7"
  fi
  dnl try compiling naked first
  AC_CHECK_LIB($1,$2, [
@@ -37,7 +37,10 @@ AC_DEFUN([EX_CHECK_ALL],
              LIBS=${LIBS}" "`$PKGCONFIG --libs-only-l $4`
 	     dnl remove the cached value and test again
 	     unset ac_cv_lib_$1_$2
-             AC_CHECK_LIB($1,$2,[ AC_CHECK_HEADER($3,[EX_CHECK_STATE=YES],[])],[])
+             AC_CHECK_LIB($1,$2,[
+	         unset ac_cv_header_`echo $3 | sed  sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+		 AC_CHECK_HEADER($3,[EX_CHECK_STATE=YES],[])
+	     ],[])
           else
              AC_MSG_WARN([
 ----------------------------------------------------------------------------