diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
| commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
| tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /m4/python.m4 | |
| parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
| parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
| download | gobject-introspection-68ff94340891f1ae4ea24546acdbbc39c4dcbcd0.tar.gz | |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'm4/python.m4')
| -rw-r--r-- | m4/python.m4 | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/m4/python.m4 b/m4/python.m4 index 74ac6ee9..ed5559da 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" @@ -70,14 +63,10 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS], [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) 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" +if test "x$PYTHON_LIBS" = x; then + 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" |