From: Yongjie Ren <yongjie.ren@intel.com>
Date: Thu, 1 Mar 2012 17:23:51 +0000 (+0000)
Subject: tools: fix python version checking issue
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=05bc2e1195adc33fb2e508c6641a2470a6cc3ed6;p=xen.git

tools: fix python version checking issue

Even if python version is 2.4.3 which is newer than the required
version 2.3, the configure script still raises a version issue.  I
tested my patch with python 2.6.6 and 2.4.3. It will fix a syntax
error like the following.

 checking for python version >= 2.3 ... Traceback (most recent call last):
   File "<string>", line 1, in ?
 TypeError: 'str' object is not callable
 no
 configure: error: Python 2.4.3 is too old, minimum required version is 2.3

Signed-off-by: Yongjie Ren <yongjie.ren@intel.com>
Acked-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/configure b/tools/configure
index b1bad1323a..cd4a93de9a 100755
--- a/tools/configure
+++ b/tools/configure
@@ -6127,7 +6127,7 @@ then
 fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python version >= 2.3 " >&5
 $as_echo_n "checking for python version >= 2.3 ... " >&6; }
-`$PYTHON -c 'import sys; exit(eval("sys.version_info < (2, 3)"))'`
+`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < (2, 3)"))'`
 if test "$?" != "0"
 then
     python_version=`$PYTHON -V 2>&1`
diff --git a/tools/m4/python_version.m4 b/tools/m4/python_version.m4
index ced76aaf19..4e2b594654 100644
--- a/tools/m4/python_version.m4
+++ b/tools/m4/python_version.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([AX_CHECK_PYTHON_VERSION],
 [AC_MSG_CHECKING([for python version >= $1.$2 ])
-`$PYTHON -c 'import sys; exit(eval("sys.version_info < ($1, $2)"))'`
+`$PYTHON -c 'import sys; sys.exit(eval("sys.version_info < ($1, $2)"))'`
 if test "$?" != "0"
 then
     python_version=`$PYTHON -V 2>&1`