From 2b8680aba9f1ab18c8acf7fb30ebf80440d1c3d5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 14 Feb 2020 13:15:15 +0100 Subject: [PATCH] python: Also detect python 3.9. -- Signed-off-by: Werner Koch --- configure.ac | 2 +- lang/python/doc/src/gpgme-python-howto.org | 4 ++-- m4/python.m4 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6b9a87b0..009fe5b5 100644 --- a/configure.ac +++ b/configure.ac @@ -425,7 +425,7 @@ if test "$found_py" = "1"; then if test "$found_py" = "1" -o "$found_py3" = "1"; then # Reset everything, so that we can look for another Python. m4_foreach([mym4pythonver], - [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]], + [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], [unset PYTHON unset PYTHON_VERSION unset PYTHON_CPPFLAGS diff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org index e2e7e719..8f7f9c53 100644 --- a/lang/python/doc/src/gpgme-python-howto.org +++ b/lang/python/doc/src/gpgme-python-howto.org @@ -464,8 +464,8 @@ case in most, if not all, cases. Note that from GPGME [[https://dev.gnupg.org/rMff6ff616aea6f59b7f2ce1176492850ecdf3851e][1.12.1]] the default installation installs to each version of Python it can find first. That is that it will currently -install for the first copies of Python versions 2.7, 3.4, 3.5, 3.6, -3.7 and 3.8 (dev branch) that it finds. Usually this will be in the +install for the first copies of Python versions 2.7, 3.4, 3.5, and so so +up until the current dev branch that it finds. Usually this will be in the same prefix as GPGME itself, but is dictated by the =$PATH= when the installation is performed. The above instructions can still be performed on other python installations which the installer does not diff --git a/m4/python.m4 b/m4/python.m4 index 2ceaf737..fd0fe771 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -38,11 +38,11 @@ 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). Python 3.0 - dnl through to Python 3.3 are also not supported. + dnl through to Python 3.9 are also not supported. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], [python2 python2.7 dnl python dnl - python3 python3.8 python3.7 python3.6 python3.5 python3.4 + python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ]) AC_ARG_VAR([PYTHON], [the Python interpreter])