diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2012-12-17 15:03:48 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2012-12-17 15:11:43 +0100 |
| commit | 46ccb9dfe51372b0fc51c93890088853d0f1617e (patch) | |
| tree | 793dcd9495ba22c668d3436b42744ef03820a2fc | |
| parent | 29e9a62c1da12f45113779235796ccbb4226d7d8 (diff) | |
| download | gobject-introspection-46ccb9dfe51372b0fc51c93890088853d0f1617e.tar.gz | |
Use python-config instead of assuming include and library paths
Call $PYTHON-config to determine include and library paths and linker flags
instead of making assumptions about them.
Also drop the unused PYTHON_LIB_LOC macro.
https://bugzilla.gnome.org/show_bug.cgi?id=690347
| -rw-r--r-- | m4/python.m4 | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/m4/python.m4 b/m4/python.m4 index 69557b66..cdd586c4 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -43,14 +43,7 @@ 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)"` -if test "x$PYTHON_INCLUDES" == x; then - 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 -fi +PYTHON_INCLUDES=`$PYTHON-config --includes` AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS" @@ -71,13 +64,9 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS], AC_MSG_CHECKING(for libraries required to link against libpython) dnl deduce PYTHON_LIBS if test "x$PYTHON_LIBS" == x; then - PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" -fi -if test "x$PYTHON_LIB_LOC" == x; then - PYTHON_LIB_LOC="${py_prefix}/lib" + PYTHON_LIBS=`$PYTHON-config --ldflags --libs` fi AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_LIB_LOC) dnl check if libpython exist: save_LIBS="$LIBS" LIBS="$LIBS $PYTHON_LIBS" |