diff options
| author | Tom Lane | 2018-04-02 16:26:09 +0000 |
|---|---|---|
| committer | Tom Lane | 2018-04-02 16:26:12 +0000 |
| commit | beff4bb9c7411cfd973e192df05c0c1f5c796d22 (patch) | |
| tree | 953f2154f6e3f5024d09bea9891a5629d2a7634a /config/python.m4 | |
| parent | 2764d5dcfa84d240c901c20ec6e194f72d82b78a (diff) | |
Teach configure --with-python to report the Python version number.
We already do this for Perl and some other interesting tools, so it
seems sensible to do it for Python as well, especially since the
sub-release number is never determinable from other configure output
and even the major/minor numbers may not be clear without excavation
in config.log.
While at it, get rid of the code's assumption that both the major and
minor numbers contain exactly one digit. That will foreseeably be
broken by Python 3.10 in perhaps four or five years. That's far enough
out that we probably don't need to back-patch this.
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'config/python.m4')
| -rw-r--r-- | config/python.m4 | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/config/python.m4 b/config/python.m4 index f3c76422296..587bca99d52 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -22,6 +22,17 @@ fi # as well as the Python version. AC_DEFUN([_PGAC_CHECK_PYTHON_DIRS], [AC_REQUIRE([PGAC_PATH_PYTHON]) +python_fullversion=`${PYTHON} -c "import sys; print(sys.version)" | sed q` +AC_MSG_NOTICE([using python $python_fullversion]) +# python_fullversion is typically n.n.n plus some trailing junk +python_majorversion=`echo "$python_fullversion" | sed '[s/^\([0-9]*\).*/\1/]'` +python_minorversion=`echo "$python_fullversion" | sed '[s/^[0-9]*\.\([0-9]*\).*/\1/]'` +python_version=`echo "$python_fullversion" | sed '[s/^\([0-9]*\.[0-9]*\).*/\1/]'` +# Reject unsupported Python versions as soon as practical. +if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 4; then + AC_MSG_ERROR([Python version $python_version is too old (version 2.4 or later is required)]) +fi + AC_MSG_CHECKING([for Python distutils module]) if "${PYTHON}" -c 'import distutils' 2>&AS_MESSAGE_LOG_FD then @@ -30,18 +41,11 @@ else AC_MSG_RESULT(no) AC_MSG_ERROR([distutils module not found]) fi + AC_MSG_CHECKING([Python configuration directory]) -python_majorversion=`${PYTHON} -c "import sys; print(sys.version[[0]])"` -python_minorversion=`${PYTHON} -c "import sys; print(sys.version[[2]])"` -python_version=`${PYTHON} -c "import sys; print(sys.version[[:3]])"` python_configdir=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBPL'))))"` AC_MSG_RESULT([$python_configdir]) -# Reject unsupported Python versions as soon as practical. -if test "$python_majorversion" -lt 3 -a "$python_minorversion" -lt 4; then - AC_MSG_ERROR([Python version $python_version is too old (version 2.4 or later is required)]) -fi - AC_MSG_CHECKING([Python include directories]) python_includespec=`${PYTHON} -c " import distutils.sysconfig |