233 lines
9.4 KiB
Diff
233 lines
9.4 KiB
Diff
--- pygtk-2.24.0/m4/python.m4.orig 2011-04-01 14:37:25.000000000 +0400
|
|
+++ pygtk-2.24.0/m4/python.m4 2014-02-01 11:34:44.000000000 +0400
|
|
@@ -43,15 +43,14 @@
|
|
[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-config"; then
|
|
-PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
|
|
-else
|
|
-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
|
|
+if test "x$PYTHON_INCLUDES" = x; then
|
|
+ PYTHON_CONFIG=`which $PYTHON`-config
|
|
+ if test -x "$PYTHON_CONFIG"; then
|
|
+ PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null`
|
|
+ else
|
|
+ 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)
|
|
dnl check if the headers exist:
|
|
@@ -64,3 +63,170 @@
|
|
$2])
|
|
CPPFLAGS="$save_CPPFLAGS"
|
|
])
|
|
+
|
|
+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_PATH_PYTHON])
|
|
+AC_MSG_CHECKING(for libraries required to embed python)
|
|
+dnl deduce PYTHON_LIBS
|
|
+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
|
|
+if test "x$PYTHON_LIB_LOC" = x; then
|
|
+ PYTHON_LIB_LOC="${py_prefix}/lib"
|
|
+fi
|
|
+AC_SUBST(PYTHON_LIBS)
|
|
+AC_SUBST(PYTHON_LIB_LOC)
|
|
+dnl check if the headers exist:
|
|
+save_LIBS="$LIBS"
|
|
+LIBS="$LIBS $PYTHON_LIBS"
|
|
+AC_TRY_LINK_FUNC(Py_Initialize, dnl
|
|
+ [LIBS="$save_LIBS"; AC_MSG_RESULT(yes); $1], dnl
|
|
+ [LIBS="$save_LIBS"; AC_MSG_RESULT(no); $2])
|
|
+
|
|
+])
|
|
+
|
|
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
|
+# Free Software Foundation, Inc.
|
|
+#
|
|
+# This file is free software; the Free Software Foundation
|
|
+# gives unlimited permission to copy and/or distribute it,
|
|
+# with or without modifications, as long as this notice is preserved.
|
|
+
|
|
+# JD_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
|
+# ---------------------------------------------------------------------------
|
|
+# Adds support for distributing Python modules and packages. To
|
|
+# install modules, copy them to $(pythondir), using the python_PYTHON
|
|
+# automake variable. To install a package with the same name as the
|
|
+# automake package, install to $(pkgpythondir), or use the
|
|
+# pkgpython_PYTHON automake variable.
|
|
+#
|
|
+# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
|
|
+# locations to install python extension modules (shared libraries).
|
|
+# Another macro is required to find the appropriate flags to compile
|
|
+# extension modules.
|
|
+#
|
|
+# If your package is configured with a different prefix to python,
|
|
+# users will have to add the install directory to the PYTHONPATH
|
|
+# environment variable, or create a .pth file (see the python
|
|
+# documentation for details).
|
|
+#
|
|
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
|
|
+# cause an error if the version of python installed on the system
|
|
+# doesn't meet the requirement. MINIMUM-VERSION should consist of
|
|
+# numbers and dots only.
|
|
+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],
|
|
+ [python3 python3.3 python3.2 python3.1 python2 python2.7 python])
|
|
+
|
|
+ m4_if([$1],[],[
|
|
+ dnl No version check is needed.
|
|
+ # Find any Python interpreter.
|
|
+ if test -z "$PYTHON"; then
|
|
+ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
|
|
+ fi
|
|
+ am_display_PYTHON=python
|
|
+ ], [
|
|
+ dnl A version check is needed.
|
|
+ if test -n "$PYTHON"; then
|
|
+ # If the user set $PYTHON, use it and don't search something else.
|
|
+ AC_MSG_CHECKING([whether $PYTHON version >= $1])
|
|
+ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
|
|
+ [AC_MSG_RESULT(yes)],
|
|
+ [AC_MSG_ERROR(too old)])
|
|
+ am_display_PYTHON=$PYTHON
|
|
+ else
|
|
+ # Otherwise, try each interpreter until we find one that satisfies
|
|
+ # VERSION.
|
|
+ AC_CACHE_CHECK([for a Python interpreter with version >= $1],
|
|
+ [am_cv_pathless_PYTHON],[
|
|
+ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
|
|
+ test "$am_cv_pathless_PYTHON" = none && break
|
|
+ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
|
|
+ done])
|
|
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
|
|
+ if test "$am_cv_pathless_PYTHON" = none; then
|
|
+ PYTHON=:
|
|
+ else
|
|
+ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
|
|
+ fi
|
|
+ am_display_PYTHON=$am_cv_pathless_PYTHON
|
|
+ fi
|
|
+ ])
|
|
+
|
|
+ if test "$PYTHON" = :; then
|
|
+ dnl Run any user-specified action, or abort.
|
|
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
|
|
+ else
|
|
+
|
|
+ dnl Query Python for its version number. Getting [:3] seems to be
|
|
+ dnl the best way to do this; it's what "site.py" does in the standard
|
|
+ dnl library.
|
|
+
|
|
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
|
|
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
|
|
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
|
|
+
|
|
+ dnl Use the values of $prefix and $exec_prefix for the corresponding
|
|
+ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
|
|
+ dnl distinct variables so they can be overridden if need be. However,
|
|
+ dnl general consensus is that you shouldn't need this ability.
|
|
+
|
|
+ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
|
|
+ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
|
|
+
|
|
+ dnl At times (like when building shared libraries) you may want
|
|
+ dnl to know which OS platform Python thinks this is.
|
|
+
|
|
+ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
|
|
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
|
|
+ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
|
|
+
|
|
+
|
|
+ dnl Set up 4 directories:
|
|
+
|
|
+ dnl pythondir -- where to install python scripts. This is the
|
|
+ dnl site-packages directory, not the python standard library
|
|
+ dnl directory like in previous automake betas. This behavior
|
|
+ dnl is more consistent with lispdir.m4 for example.
|
|
+ dnl Query distutils for this directory. distutils does not exist in
|
|
+ dnl Python 1.5, so we fall back to the hardcoded directory if it
|
|
+ dnl doesn't work.
|
|
+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
|
|
+ [am_cv_python_pythondir],
|
|
+ [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
|
|
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
|
|
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
|
|
+
|
|
+ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
|
|
+ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
|
|
+ dnl more consistent with the rest of automake.
|
|
+
|
|
+ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
|
|
+
|
|
+ dnl pyexecdir -- directory for installing python extension modules
|
|
+ dnl (shared libraries)
|
|
+ dnl Query distutils for this directory. distutils does not exist in
|
|
+ dnl Python 1.5, so we fall back to the hardcoded directory if it
|
|
+ dnl doesn't work.
|
|
+ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
|
|
+ [am_cv_python_pyexecdir],
|
|
+ [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
|
|
+ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
|
|
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
|
|
+
|
|
+ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
|
|
+
|
|
+ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
|
|
+
|
|
+ dnl Run any user-specified action.
|
|
+ $2
|
|
+ fi
|
|
+
|
|
+])
|
|
--- pygtk-2.24.0/configure.ac.orig 2014-02-23 18:57:43.401800000 +0400
|
|
+++ pygtk-2.24.0/configure.ac 2014-02-23 18:57:54.789800000 +0400
|
|
@@ -77,22 +77,16 @@
|
|
|
|
AM_PATH_PYTHON(2.3.5)
|
|
|
|
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
|
|
-
|
|
-AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
|
|
-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
|
|
-old_CPPFLAGS=$CPPFLAGS
|
|
-CPPFLAGS="-Wall -Werror $PYTHON_INCLUDES"
|
|
-AC_TRY_COMPILE([#include <Python.h>],
|
|
- [PySignal_SetWakeupFd(0);],
|
|
- setwakeupfd_ok=yes,
|
|
- setwakeupfd_ok=no)
|
|
-AC_MSG_RESULT($setwakeupfd_ok)
|
|
-if test "x$setwakeupfd_ok" != xno; then
|
|
- AC_DEFINE(HAVE_PYSIGNAL_SETWAKEUPFD, 1,
|
|
- [Define to 1 if PySignal_SetWakeupFd is available])
|
|
-fi
|
|
-CPPFLAGS=$old_CPPFLAGS
|
|
+# - 'SO' for PyPy, CPython 2.7-3.2
|
|
+# - 'EXT_SUFFIX' for CPython3.3+ (http://bugs.python.org/issue16754)
|
|
+# - fallback to '.so'
|
|
+PYTHON_SO=`$PYTHON -c "import distutils.sysconfig, sys; get = distutils.sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.so');"`
|
|
+AC_SUBST(PYTHON_SO)
|
|
+
|
|
+AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
|
|
+if test "x$os_win32" = "xyes"; then
|
|
+ AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
|
|
+fi
|
|
|
|
AC_ARG_ENABLE(thread,
|
|
AC_HELP_STRING([--disable-thread], [Disable pygtk threading support]),,
|