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

diff --git a/acinclude.m4 b/acinclude.m4
index 7d7cc9e..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([
 ----------------------------------------------------------------------------
@@ -441,3 +444,31 @@ Check config.log to see what went wrong ...
 AC_LANG_POP(C)
 
 ])
+
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+