From 99db351288d5bb075f124ef10e540e25bc36b70a Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 14 Sep 2016 13:00:20 +0200 Subject: python: Improve build system integration. * configure.ac: Try to compile a Python module for each version. * m4/m4_ax_swig_python.m4: Drop unused file. Signed-off-by: Justus Winter --- configure.ac | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bcac13f7..352ac8b8 100644 --- a/configure.ac +++ b/configure.ac @@ -392,6 +392,11 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then PYTHON_VERSIONS= unset PYTHON unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS + unset PYTHON_SITE_PKG + unset PYTHON_EXTRA_LIBS + unset PYTHON_EXTRA_LDFLAGS unset ac_cv_path_PYTHON unset am_cv_pathless_PYTHON unset am_cv_python_version @@ -401,6 +406,7 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then if test "$found_py" = "1" -o "$found_py2" = "1"; then AM_PATH_PYTHON([2.7]) + AX_PYTHON_DEVEL if test "$PYTHON"; then PYTHONS="$(echo $PYTHONS $PYTHON)" PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)" @@ -411,6 +417,11 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. unset PYTHON unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS + unset PYTHON_SITE_PKG + unset PYTHON_EXTRA_LIBS + unset PYTHON_EXTRA_LDFLAGS unset ac_cv_path_PYTHON unset am_cv_pathless_PYTHON unset am_cv_python_version @@ -418,6 +429,7 @@ if test "$found_py" = "1" -o "$found_py2" = "1" -o "$found_py3" = "1"; then unset am_cv_python_pythondir unset am_cv_python_pyexecdir AM_PATH_PYTHON([3.4]) + AX_PYTHON_DEVEL if test "$PYTHON"; then PYTHONS="$(echo $PYTHONS $PYTHON)" PYTHON_VERSIONS="$(echo $PYTHON_VERSIONS $PYTHON_VERSION)" -- cgit v1.2.3