diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:39:06 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-07-12 08:39:09 +0900 |
| commit | 23384e73cb73bc8875384183d5916e33af4196d4 (patch) | |
| tree | be92faf8967d24f2be88a92b4f7506e9d65fbf3d /m4/python.m4 | |
| parent | 705bf16f6a14a07ccdc0c1a5fe1b31d92c3bd96e (diff) | |
| download | pygobject2-23384e73cb73bc8875384183d5916e33af4196d4.tar.gz pygobject2-23384e73cb73bc8875384183d5916e33af4196d4.tar.bz2 pygobject2-23384e73cb73bc8875384183d5916e33af4196d4.zip | |
Imported Upstream version 3.10.0
Change-Id: Ib97d541be276a6a70923c214755d8273c4437a2f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'm4/python.m4')
| -rw-r--r-- | m4/python.m4 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/m4/python.m4 b/m4/python.m4 index 3cfb9e2..95ae809 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -48,12 +48,8 @@ if test "x$PYTHON_INCLUDES" = x; then if test -x "$PYTHON_CONFIG"; then PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null` else - py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` - py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` - 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 + PYTHON_INCLUDES=`$PYTHON -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_inc(True))"` + PYTHON_INCLUDES="-I$PYTHON_INCLUDES" fi fi AC_SUBST(PYTHON_INCLUDES) @@ -72,10 +68,10 @@ dnl a macro to check for ability to embed python dnl AM_CHECK_PYTHON_LIBS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) dnl function also defines PYTHON_LIBS AC_DEFUN([AM_CHECK_PYTHON_LIBS], -[AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) +[AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for libraries required to embed python) dnl deduce PYTHON_LIBS -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` +py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` if test "x$PYTHON_LIBS" = x; then PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" fi @@ -146,8 +142,7 @@ AC_DEFUN([JD_PATH_PYTHON], dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) + [python3 python3.3 python3.2 python3.1 python2 python2.7 python]) m4_if([$1],[],[ dnl No version check is needed. |