diff options
| -rw-r--r-- | acinclude.m4 | 7 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a6b9ebe..8c75106 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -228,7 +228,12 @@ 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 -PYTHON_INCLUDES="$PYTHON_INCLUDES `python-config --includes`" +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="`$PYTHON-config --includes`" +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" diff --git a/debian/changelog b/debian/changelog index 52eed2c..789d128 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libappindicator (12.10.9-0ubuntu1~mtrudel1) raring; urgency=low +libappindicator (12.10.1-0ubuntu2) UNRELEASED; urgency=low + [ Mathieu Trudel-Lapierre ] * debian/control: - Update style: use trailing commas at the end of dependency lists. - Reorganize Build-Depends for clarity. @@ -20,7 +21,10 @@ libappindicator (12.10.9-0ubuntu1~mtrudel1) raring; urgency=low * Fix gtkdoc tests and building of the documentation given a separate build directory. - -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 26 Nov 2012 11:02:18 -0500 + [ Chris J Arges ] + * acinclude.m4: Fix python multi-arch include issues. + + -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600 libappindicator (12.10.0-0ubuntu1) quantal; urgency=low |