From fad8f93ad8079a887bb3b13fb52aeef4ed473513 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Wed, 30 Sep 2015 03:55:42 -0400 Subject: [PATCH] configure: Clean up Python checking This fixes requiring to add a version every time a new release comes out... --- configure.ac | 34 ++-- m4/ax_python_devel.m4 | 327 +++++++++++++++++++++++++++++++++++++ plugins/python/Makefile.am | 5 +- 3 files changed, 343 insertions(+), 23 deletions(-) create mode 100644 m4/ax_python_devel.m4 diff --git a/configure.ac b/configure.ac index 1c186016..496b1cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -263,39 +263,31 @@ AS_IF([test "x$python" != xno], [ AS_CASE([$python], dnl set python2 default here [python2], [ - PKG_CHECK_MODULES([PY], [python-2.7], - [PY_VER="`$PKG_CONFIG --modversion python-2.7`"], - [true]) + PYTHON_VERSION=2 + AX_PYTHON_DEVEL([>= '2.7']) ], dnl set python3 default here [python3], [ - PKG_CHECK_MODULES([PY], [python-3.4], - [PY_VER="`$PKG_CONFIG --modversion python-3.4`"], - [true]) - AS_IF([test "$PY_VER" = ""], [ - PKG_CHECK_MODULES([PY], [python-3.3], - [PY_VER="`$PKG_CONFIG --modversion python-3.3`"], - [true]) - ]) - ], + PYTHON_VERSION=3 + AX_PYTHON_DEVEL([>= '3.3']) + ], dnl add broken versions here [python2.5|python2.6|python3.1|python3.2], [ AC_MSG_WARN(Unsupported Python version ${python}!) ], + dnl user supplied version [python*], [ - python="python-${python#python}" # stay posix compliant - PKG_CHECK_MODULES([PY], [${python}], - [PY_VER="`$PKG_CONFIG --modversion ${python}`"], - [AC_MSG_WARN(Cannot find "${python}.pc"!)]) + PYTHON_VERSION="${python#python}" + AX_PYTHON_DEVEL() ],[ AC_MSG_WARN(Unsupported Python ${python}!) ] ) AC_MSG_CHECKING(Python version) - AS_IF([test "$PY_VER"], [ - AC_MSG_RESULT($PY_VER) - python="python-${PY_VER}" + AS_IF([test "$ac_python_version" != ""], [ + AC_MSG_RESULT($ac_python_version) + python="python-${ac_python_version}" ], [ AC_MSG_RESULT(Not found) python=no @@ -656,8 +648,8 @@ AC_SUBST(COMMON_LIBS) AC_SUBST(COMMON_CFLAGS) AC_SUBST(PERL_CFLAGS) AC_SUBST(PERL_LDFLAGS) -AC_SUBST(PY_CFLAGS) -AC_SUBST(PY_LIBS) +AC_SUBST(PYTHON_CPPFLAGS) +AC_SUBST(PYTHON_LIBS) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) AC_SUBST(OPENSSL_LIBS) diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 new file mode 100644 index 00000000..f18ed8a0 --- /dev/null +++ b/m4/ax_python_devel.m4 @@ -0,0 +1,327 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEVEL([version]) +# +# DESCRIPTION +# +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it +# in your configure.ac. +# +# This macro checks for Python and tries to get the include path to +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output +# variables. It also exports $(PYTHON_EXTRA_LIBS) and +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. +# +# You can search for some particular version of Python by passing a +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +# note that you *have* to pass also an operator along with the version to +# match, and pay special attention to the single quotes surrounding the +# version number. Don't use "PYTHON_VERSION" for this: that environment +# variable is declared as precious and thus reserved for the end-user. +# +# This macro should work for all versions of Python >= 2.1.0. As an end +# user, you can disable the check for the python version by setting the +# PYTHON_NOVERSIONCHECK environment variable to something else than the +# empty string. +# +# If you need to use this macro for an older Python version, please +# contact the authors. We're always open for feedback. +# +# LICENSE +# +# Copyright (c) 2009 Sebastian Huber +# Copyright (c) 2009 Alan W. Irwin +# Copyright (c) 2009 Rafael Laboissiere +# Copyright (c) 2009 Andrew Collier +# Copyright (c) 2009 Matteo Settenvini +# Copyright (c) 2009 Horst Knorr +# Copyright (c) 2013 Daniel Mullner +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 18 + +AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) +AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON_VERSION],[The installed Python + version to use, for example '2.3'. This string + will be appended to the Python interpreter + canonical name.]) + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) + PYTHON_VERSION="" + fi + + # + # 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; \ + 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]) + AC_MSG_FAILURE([ +This version of the AC@&t@_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +]) + else + AC_MSG_RESULT([skip at user request]) + fi + else + AC_MSG_RESULT([yes]) + fi + + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See ``configure --help'' for reference. +]) + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test -z "$ac_distutils_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + PYTHON_VERSION="" + fi + + # + # Check for Python include path + # + 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 ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi + fi + PYTHON_CPPFLAGS=$python_path + fi + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) + AC_SUBST([PYTHON_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) + if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) + AC_LANG_POP([C]) + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then + AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LIBS environment variable. + Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + PYTHON_VERSION="" + fi + + # + # all done! + # +]) diff --git a/plugins/python/Makefile.am b/plugins/python/Makefile.am index 063f2009..856c733e 100644 --- a/plugins/python/Makefile.am +++ b/plugins/python/Makefile.am @@ -3,6 +3,7 @@ libdir = $(hexchatlibdir) lib_LTLIBRARIES = python.la python_la_SOURCES = python.c python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module -python_la_LIBADD = $(PY_LIBS) $(GLIB_LIBS) -python_la_CFLAGS = $(PY_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common +python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS) +python_la_CPPFLAGS = $(PYTHON_CPPFLAGS) +python_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common