Skip to content
Snippets Groups Projects
Commit 6623385b authored by Karl-Hermann Wieners's avatar Karl-Hermann Wieners
Browse files

Fixed minimum Python version required to 2.6

parent 80a514aa
No related branches found
No related tags found
1 merge request!71.0.10 Python: 2 to 3, (dt,dt) / td division, mtime object interface
This commit is part of merge request !7. Comments created here will be created in the context of that merge request.
......@@ -15843,13 +15843,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.7" >&5
$as_echo_n "checking whether $PYTHON version is >= 2.7... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.6" >&5
$as_echo_n "checking whether $PYTHON version is >= 2.6... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
# map returns an iterator in Python 3.0 and a list in 2.x
minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
minverhex = 0
# xrange is not present in Python 3.0 and range returns an iterator
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
......@@ -15870,8 +15870,8 @@ fi
else
# Otherwise, try each interpreter until we find one that satisfies
# VERSION.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.7" >&5
$as_echo_n "checking for a Python interpreter with version >= 2.7... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.6" >&5
$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; }
if ${am_cv_pathless_PYTHON+:} false; then :
$as_echo_n "(cached) " >&6
else
......@@ -15882,7 +15882,7 @@ else
# split strings by '.' and convert to numeric. Append some zeros
# because we need at least 4 digits for the hex conversion.
# map returns an iterator in Python 3.0 and a list in 2.x
minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0]
minverhex = 0
# xrange is not present in Python 3.0 and range returns an iterator
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
......
......@@ -36,7 +36,7 @@ AM_CONDITIONAL([FCMODUC], [test x"$acx_cv_fc_module_naming_upper" = xyes])
ACX_FC_MODULE_IN_FLAG([AC_SUBST([FCMODINC], ["$acx_cv_fc_module_in_flag"])])
AC_LANG_POP([Fortran])
AM_PATH_PYTHON([2.7])
AM_PATH_PYTHON([2.6])
AC_SEARCH_LIBS([roundf], [m])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment