python plugin: Add MIT license header to all source files.

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 232d455..b02f004 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2678,6 +2678,10 @@ AC_ARG_WITH(python, [AS_HELP_STRING([--with-python@<:@=PREFIX@:>@], [Path to the
 ], [with_python="yes"])
 
 SAVE_PATH="$PATH"
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+SAVE_LIBS="$LIBS"
+
 PATH="$with_python_path"
 
 if test "x$with_python" = "xyes" && test "x$with_python_prog" = "x"
@@ -2693,17 +2697,15 @@ then
        fi
 fi
 
-PATH="$SAVE_PATH"
-
 if test "x$with_python" = "xyes"
 then
        AC_MSG_CHECKING([for Python CPPFLAGS])
-       python_include_path=`echo "import distutils.sysconfig;print distutils.sysconfig.get_python_inc()" | "$with_python_prog" 2>/dev/null`
+       python_include_path=`echo "import distutils.sysconfig;print distutils.sysconfig.get_python_inc()" | "$with_python_prog" 2>&1`
        python_config_status=$?
 
        if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
        then
-               AC_MSG_RESULT([failed with status $python_config_status])
+               AC_MSG_RESULT([failed with status $python_config_status (output: $python_include_path)])
                with_python="no"
        else
                AC_MSG_RESULT([$python_include_path])
@@ -2712,13 +2714,21 @@ fi
 
 if test "x$with_python" = "xyes"
 then
+       CPPFLAGS="-I$python_include_path $CPPFLAGS"
+       AC_CHECK_HEADERS(Python.h,
+                        [with_python="yes"],
+                        [with_python="no ('Python.h' not found)"])
+fi
+
+if test "x$with_python" = "xyes"
+then
        AC_MSG_CHECKING([for Python LDFLAGS])
        python_library_path=`echo "import distutils.sysconfig;print distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)" | "$with_python_prog" 2>&1`
        python_config_status=$?
 
        if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
        then
-               AC_MSG_RESULT([failed with status $python_config_status])
+               AC_MSG_RESULT([failed with status $python_config_status (output: $python_library_path)])
                with_python="no"
        else
                AC_MSG_RESULT([$python_library_path])
@@ -2733,7 +2743,7 @@ then
 
        if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
        then
-               AC_MSG_RESULT([failed with status $python_config_status])
+               AC_MSG_RESULT([failed with status $python_config_status (output: $python_library_flags)])
                with_python="no"
        else
                AC_MSG_RESULT([$python_library_flags])
@@ -2742,6 +2752,21 @@ fi
 
 if test "x$with_python" = "xyes"
 then
+       LDFLAGS="-L$python_library_path $LDFLAGS"
+       LIBS="$python_library_flags $LIBS"
+
+       AC_CHECK_FUNC(PyObject_CallFunction,
+                     [with_python="yes"],
+                     [with_python="no (Symbol 'PyObject_CallFunction' not found)"])
+fi
+
+PATH="$SAVE_PATH"
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+LIBS="$SAVE_LIBS"
+
+if test "x$with_python" = "xyes"
+then
        BUILD_WITH_PYTHON_CPPFLAGS="-I$python_include_path"
        BUILD_WITH_PYTHON_LDFLAGS="-L$python_library_path"
        BUILD_WITH_PYTHON_LIBS="$python_library_flags"