1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
|
Description: Port build system to use Python 3
Update autoconf build system bits to find Python 3.
Author: Stuart Prescott <stuart@debian.org>
Bug: #938803
--- a/configure.ac
+++ b/configure.ac
@@ -273,7 +273,7 @@
if test -n "$enable_python" -a "$enable_python" != "no" ; then
AM_PATH_PYTHON(2.3.5)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
PKG_CHECK_MODULES(PYGTK, pygobject-2.0 pygtk-2.0, [have_pygtk=yes], [have_pygtk=no])
@@ -447,9 +447,9 @@
dnl Add Python support for the PythonGI plug-in.
AM_PATH_PYTHON(2.3)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
- PYTHON_INCLUDES="`python-config --cflags`"
+ PYTHON_INCLUDES="`python3-config --cflags`"
AC_SUBST(PYTHON_INCLUDES)
- PYTHON_LIBS="`python-config --libs`"
+ PYTHON_LIBS="`python3-config --libs`"
AC_SUBST(PYTHON_LIBS)
AC_MSG_CHECKING(for pygobject overrides directory)
@@ -478,9 +478,9 @@
dnl AC_PROG_CC set the CC variable and detect if we use the GNU compiler
dnl We now append some various CFLAGS depending on platform and choice
dnl of the user.
-AC_ARG_WITH(strict-cflags, AS_HELP_STRING([--with-strict-cflags], [if set or absent some correctness cflags are appended to the CFLAGS variable. Appended values dependent on the platform and code branch (default on Unix for development is Wall Wno-unused W Werror ansi pedantic-errors).]), [STRICT_CFLAGS=$withval], [STRICT_CFLAGS="yes"])
-flags='Wall W ansi'
-flags_cpp='Wall W ansi'
+AC_ARG_WITH(strict-cflags, AS_HELP_STRING([--with-strict-cflags], [if set or absent some correctness cflags are appended to the CFLAGS variable. Appended values dependent on the platform and code branch (default on Unix for development is Wall Wno-unused W Werror pedantic-errors).]), [STRICT_CFLAGS=$withval], [STRICT_CFLAGS="yes"])
+flags='Wall W'
+flags_cpp='Wall W'
if test "$GCC" = "yes" -a "$STRICT_CFLAGS" = "yes"; then
dnl Used flags for V_Sim.
if test "$PACKAGE" = "v_sim-dev" ; then
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -43,8 +43,8 @@
[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"`
+py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
+py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
if test -x "$PYTHON-config"; then
PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
else
--- a/configure
+++ b/configure
@@ -24830,8 +24830,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
$as_echo_n "checking for headers required to compile python extensions... " >&6; }
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
+py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
if test -x "$PYTHON-config"; then
PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
else
@@ -24859,7 +24859,7 @@
rm -f conftest.err conftest.i conftest.$ac_ext
CPPFLAGS="$save_CPPFLAGS"
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
@@ -29835,8 +29835,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
$as_echo_n "checking for headers required to compile python extensions... " >&6; }
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
+py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
if test -x "$PYTHON-config"; then
PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
else
@@ -29864,9 +29864,9 @@
rm -f conftest.err conftest.i conftest.$ac_ext
CPPFLAGS="$save_CPPFLAGS"
- PYTHON_INCLUDES="`python-config --cflags`"
+ PYTHON_INCLUDES="`python3-config --cflags`"
- PYTHON_LIBS="`python-config --libs`"
+ PYTHON_LIBS="`python3-config --libs`"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygobject overrides directory" >&5
|