From 5189c08af9468cdeb6f16a6ecd0fee53e1e3aa0e Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 9 Mar 2017 16:55:18 +0100 Subject: [PATCH] build: Tune M4 macros for our needs. * m4/ax_python_devel.m4: Do not emit 'HAVE_PYTHON'. * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add newer Python versions, drop older ones. Also, sort the list with older versions at the front, newer and generic versions towards the end. This makes the algorithm pick the lowest version that meets the version requirement. Signed-off-by: Justus Winter --- m4/ax_python_devel.m4 | 7 +++++-- m4/python.m4 | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 index de992c88..b990d5b3 100644 --- a/m4/ax_python_devel.m4 +++ b/m4/ax_python_devel.m4 @@ -195,8 +195,11 @@ EOD` fi # Make the versioning information available to the compiler - AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], - [If available, contains the Python version number currently in use.]) + + # JW: We don't need it and it interferes with the hack + # to detect multiple Pyhton versions + #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], + # [If available, contains the Python version number currently in use.]) # First, the library directory: ac_python_libdir=`cat<