From 89133740412019a99bc56c78d2f8286281603d83 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 14 Jul 2008 21:56:55 +0000 Subject: Bug 448173 – use python-config to get python includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-07-14 Johan Dahlin Bug 448173 – use python-config to get python includes * configure.ac: Really close the by, patch by Matthias Klose svn path=/trunk/; revision=805 --- ChangeLog | 7 +++++++ configure.ac | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12421c7..8be6878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-14 Johan Dahlin + + Bug 448173 – use python-config to get python includes + + * configure.ac: + Really close the by, patch by Matthias Klose + 2008-07-14 Johan Dahlin Bug 378704 – OptionParser.parse_args() returns unexpected results diff --git a/configure.ac b/configure.ac index 5986789..87b5789 100644 --- a/configure.ac +++ b/configure.ac @@ -9,8 +9,8 @@ m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pyg dnl versions of packages we require ... m4_define(glib_required_version, 2.8.0) -m4_define(gio_required_version, 2.15.7) -m4_define(giounix_required_version, 2.15.7) +m4_define(gio_required_version, 2.16.0) +m4_define(giounix_required_version, 2.16.0) AC_INIT(pygobject, pygobject_version, [http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject]) @@ -73,7 +73,11 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h]) py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +if test -x "$PYTHON-config"; then +PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` +else PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +fi old_CPPFLAGS=$CPPFLAGS CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES" AC_TRY_COMPILE([#include ], -- cgit