diff options
| author |  Andrew Udvare | 2014-01-31 15:06:28 -0800 |
|---|---|---|
| committer |  Nikias Bassen | 2014-02-11 17:27:12 +0100 |
| commit | cb1bb14ae178af13e2fb2d9da78df16bebef23b6 (patch) | |
| tree | 181f92c283ee05c1291a2ca35e2ba9917bb03267 /m4 | |
| parent | cd98a7716020f9db30d66f00ec7c19104125cb31 (diff) | |
| download | libplist-cb1bb14ae178af13e2fb2d9da78df16bebef23b6.tar.gz libplist-cb1bb14ae178af13e2fb2d9da78df16bebef23b6.tar.bz2 | |
Fixes for Python 3.x (mainly that print is a function in 3 and can generally be treated like one in version 2.x)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ac_python_devel.m4 | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4 index 99ff7d0..2e7406e 100644 --- a/m4/ac_python_devel.m4 +++ b/m4/ac_python_devel.m4 @@ -89,9 +89,9 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ # Check for a version of Python >= 2.1.0 # AC_MSG_CHECKING([for a version of Python >= '2.1.0']) - ac_supports_python_ver=`$PYTHON -c "import sys, string; \ - ver = string.split(sys.version)[[0]]; \ - print ver >= '2.1.0'"` + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split()[[0]]; \ + print(ver >= '2.1.0')"` if test "$ac_supports_python_ver" != "True"; then if test -z "$PYTHON_NOVERSIONCHECK"; then AC_MSG_RESULT([no]) @@ -116,9 +116,9 @@ to something else than an empty string. # if test -n "$1"; then AC_MSG_CHECKING([for a version of Python $1]) - ac_supports_python_ver=`$PYTHON -c "import sys, string; \ - ver = string.split(sys.version)[[0]]; \ - print ver $1"` + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split()[[0]]; \ + print(ver >= '2.1.0')"` if test "$ac_supports_python_ver" = "True"; then AC_MSG_RESULT([yes]) else @@ -153,7 +153,7 @@ $ac_distutils_result]) AC_MSG_CHECKING([for Python include path]) if test -z "$PYTHON_CPPFLAGS"; then python_path=`$PYTHON -c "import distutils.sysconfig; \ - print distutils.sysconfig.get_python_inc();"` + print(distutils.sysconfig.get_python_inc());"` if test -n "${python_path}"; then python_path="-I$python_path" fi @@ -170,21 +170,19 @@ $ac_distutils_result]) # (makes two attempts to ensure we've got a version number # from the interpreter) py_version=`$PYTHON -c "from distutils.sysconfig import *; \ - from string import join; \ - print join(get_config_vars('VERSION'))"` + print(' '.join(get_config_vars('VERSION')))"` if test "$py_version" = "[None]"; then if test -n "$PYTHON_VERSION"; then py_version=$PYTHON_VERSION else py_version=`$PYTHON -c "import sys; \ - print sys.version[[:3]]"` + print(sys.version[[:3]]")` fi fi PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \ - from string import join; \ - print '-L' + get_python_lib(0,1), \ - '-lpython';"`$py_version + print('-L' + get_python_lib(0,1) + \ + ' -lpython');"`$py_version fi AC_MSG_RESULT([$PYTHON_LDFLAGS]) AC_SUBST([PYTHON_LDFLAGS]) @@ -195,7 +193,7 @@ $ac_distutils_result]) AC_MSG_CHECKING([for Python site-packages path]) if test -z "$PYTHON_SITE_PKG"; then PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ - print distutils.sysconfig.get_python_lib(0,0);"` + print(distutils.sysconfig.get_python_lib(0,0))"` fi AC_MSG_RESULT([$PYTHON_SITE_PKG]) AC_SUBST([PYTHON_SITE_PKG]) @@ -207,7 +205,7 @@ $ac_distutils_result]) if test -z "$PYTHON_EXTRA_LIBS"; then PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ - print conf('LOCALMODLIBS'), conf('LIBS')"` + print(conf('LOCALMODLIBS'), conf('LIBS'))"` fi AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) AC_SUBST(PYTHON_EXTRA_LIBS) @@ -219,7 +217,7 @@ $ac_distutils_result]) if test -z "$PYTHON_EXTRA_LDFLAGS"; then PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ - print conf('LINKFORSHARED')"` + print(conf('LINKFORSHARED'))"` fi AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) AC_SUBST(PYTHON_EXTRA_LDFLAGS) |