summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2018-03-03 12:01:13 +0100
committerMathieu Lirzin <mthl@gnu.org>2018-03-08 21:26:56 +0100
commit9385c161707c6d2295d610eef81fe4d1a44b44de (patch)
tree9d37ac434dbbd95f08d5144bca4df8c0883544de
parent6bab5b26a1241b0e0edd058d2a921989f9a1747c (diff)
downloadautomake-9385c161707c6d2295d610eef81fe4d1a44b44de.tar.gz
python: Support future python version up to 3.9
This change fixes automake bug#28160. Since AM_PYTHON_PATH macro takes no maximum version argument, there is no need to generate _AM_PYTHON_INTERPRETER_LIST dynamically, like what was previously done by the reverted commit 1d60fb72168e62d33fe433380af621de64e22f23. We could rely on M4 to generate this list statically however this is likely to be a complex solution that would not improve maintainability. * m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add 'python3.7', 'python3.8', and 'python3.9'. * NEWS: Update.
-rw-r--r--NEWS5
-rw-r--r--m4/python.m49
2 files changed, 10 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 0d219beee..f2cedfc48 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,11 @@
New in ?.?.?:
+* Bugs fixed:
+
+ - A regression in AM_PYTHON_PATH causing the rejection of non literal
+ minimum version parameter hasn't been fixed. (automake bug#30616)
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.16:
diff --git a/m4/python.m4 b/m4/python.m4
index 58dd18761..63c0a0e04 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -36,11 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON],
[
dnl Find a Python interpreter. Python versions prior to 2.0 are not
dnl supported. (2.0 was released on October 16, 2000).
- dnl FIXME: Remove the need to hard-code Python versions here.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python python2 python3 python3.6 python3.5 python3.4 python3.3 python3.2 dnl
- python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 dnl
- python2.2 python2.1 python2.0])
+[python python2 python3 dnl
+ python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
+ python3.2 python3.1 python3.0 dnl
+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
+ python2.0])
AC_ARG_VAR([PYTHON], [the Python interpreter])