From 408c28f588adc884e9e0cb2358426a703f52d733 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 2 Nov 2011 18:18:14 +0000 Subject: [PATCH] python: Correctly check for Python major/minor. The manual for sys.version warns that you should not parse the string, which we were doing. It would have failed on python "2.10" or similar. Do it correctly using the sys.version_info struct instead. (cherry picked from commit 646142f5136da9cfe2b908703a822c53350f70e9) --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3b611f9..3f91193 100644 --- a/configure.ac +++ b/configure.ac @@ -604,7 +604,9 @@ AS_IF([test "x$enable_python" != "xno"], AC_MSG_RESULT([$PYTHON_PREFIX]) AC_MSG_CHECKING([Python version]) - PYTHON_VERSION=`$PYTHON -c "import sys; print (sys.version[[0:3]])"` + PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info.major)"` + PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info.minor)"` + PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR" AC_MSG_RESULT([$PYTHON_VERSION]) AC_MSG_CHECKING([for Python include path]) -- 1.8.3.1