summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorMarian Csontos <mcsontos@redhat.com>2020-12-11 12:16:16 +0100
committerMarian Csontos <mcsontos@redhat.com>2020-12-11 12:16:16 +0100
commit23ef67776210ad6c55f4dd7475b806337140c513 (patch)
treefd57c460700ed3544789d83550dd3209380d634c /aclocal.m4
parent5dbe2fdd9dd783c2911a5375d6fdec86118af280 (diff)
downloadlvm2-23ef67776210ad6c55f4dd7475b806337140c513.tar.gz
configure: update
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m410
1 files changed, 6 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 3e0fbd38d..7524c8313 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -496,12 +496,14 @@ AC_DEFUN([AM_PATH_PYTHON],
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
else
- dnl Query Python for its version number. Getting [:3] seems to be
- dnl the best way to do this; it's what "site.py" does in the standard
- dnl library.
+ dnl Query Python for its version number. Although site.py simply uses
+ dnl sys.version[:3], printing that failed with Python 3.10, since the
+ dnl trailing zero was eliminated. So now we output just the major
+ dnl and minor version numbers, as numbers. Apparently the tertiary
+ dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+ [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding