Fix the Python version check to use constructs available in older
authorGreg Hudson <ghudson@mit.edu>
Wed, 17 Mar 2010 19:34:48 +0000 (19:34 +0000)
committerGreg Hudson <ghudson@mit.edu>
Wed, 17 Mar 2010 19:34:48 +0000 (19:34 +0000)
versions of Python.  (python --version was added in 2.5.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23813 dc483132-0cff-0310-8789-dd5450dbe970

src/configure.in

index 46f2a25c8a7f617e1617b720f6e8a3ecc92a793b..8e2afb2d410e8dd755e3637e3d7d46b7c0f8eebd 100644 (file)
@@ -930,19 +930,13 @@ AC_SUBST(HAVE_RUNTEST)
 
 # For Python tests.
 AC_CHECK_PROG(PYTHON,python,python)
+HAVE_PYTHON=no
 if test x"$PYTHON" != x; then
        # k5test.py requires python 2.4 (for the subprocess module).
-       pyversion=$(python --version 2>&1 | awk '{print $2}')
-       case $pyversion in
-       1.*|2.0.*|2.1.*|2.2.*|2.3.*)
-               HAVE_PYTHON=no
-               ;;
-       *)
+       vercheck="import sys;sys.exit((sys.hexversion < 0x2040000) and 1 or 0)"
+       if python -c "$vercheck"; then
                HAVE_PYTHON=yes
-               ;;
-       esac
-else
-       HAVE_PYTHON=no
+       fi
 fi
 AC_SUBST(HAVE_PYTHON)