diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-06-10 09:04:22 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-06-23 11:08:52 -0700 |
| commit | e23812fc60afd7d4708c5e1fae72c0539a90b8ce (patch) | |
| tree | ba2b22d193a62d3940b3b90a76fcd9d33a6eadc9 /m4 | |
| parent | 7102846b867cf0dc061876fc3b7caa33e72173aa (diff) | |
| download | openvswitch-e23812fc60afd7d4708c5e1fae72c0539a90b8ce.tar.gz | |
Increase prerequisite from Python 2.4 to Python 2.7.
This means that users of XenServer 6.5 and earlier will need to install
Python 2.7.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 2b84b44fb..f89cde04e 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -249,22 +249,22 @@ dnl Checks for valgrind/valgrind.h. AC_DEFUN([OVS_CHECK_VALGRIND], [AC_CHECK_HEADERS([valgrind/valgrind.h])]) -dnl Checks for Python 2.x, x >= 4. +dnl Checks for Python 2.x, x >= 7. AC_DEFUN([OVS_CHECK_PYTHON], [AC_CACHE_CHECK( - [for Python 2.x for x >= 4], + [for Python 2.x for x >= 7], [ovs_cv_python], [if test -n "$PYTHON"; then ovs_cv_python=$PYTHON else ovs_cv_python=no - for binary in python python2.4 python2.5 python2.7; do + for binary in python python2.7; do ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR for dir in $PATH; do IFS=$ovs_save_IFS test -z "$dir" && dir=. if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys -if sys.hexversion >= 0x02040000 and sys.hexversion < 0x03000000: +if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000: sys.exit(0) else: sys.exit(1)'; then @@ -297,36 +297,6 @@ AC_DEFUN([OVS_CHECK_DOT], fi]) AM_CONDITIONAL([HAVE_DOT], [test "$ovs_cv_dot" = yes])]) -dnl Checks whether $PYTHON supports the module given as $1 -AC_DEFUN([OVS_CHECK_PYTHON_MODULE], - [AC_REQUIRE([OVS_CHECK_PYTHON]) - AC_CACHE_CHECK( - [for $1 Python module], - [ovs_cv_py_[]AS_TR_SH([$1])], - [ovs_cv_py_[]AS_TR_SH([$1])=no - if test $HAVE_PYTHON = yes; then - AS_ECHO(["running $PYTHON -c 'import $1 -import sys -sys.exit(0)'..."]) >&AS_MESSAGE_LOG_FD 2>&1 - if $PYTHON -c 'import $1 -import sys -sys.exit(0)' >&AS_MESSAGE_LOG_FD 2>&1; then - ovs_cv_py_[]AS_TR_SH([$1])=yes - fi - fi])]) - -dnl Checks for missing python modules at build time -AC_DEFUN([OVS_CHECK_PYTHON_COMPAT], - [OVS_CHECK_PYTHON_MODULE([uuid]) - if test $ovs_cv_py_uuid = yes; then - INCLUDE_PYTHON_COMPAT=no - else - INCLUDE_PYTHON_COMPAT=yes - fi - AC_MSG_CHECKING([whether to add python/compat to PYTHONPATH]) - AC_MSG_RESULT([$INCLUDE_PYTHON_COMPAT]) - AM_CONDITIONAL([INCLUDE_PYTHON_COMPAT], [test $INCLUDE_PYTHON_COMPAT = yes])]) - dnl Checks for groff. AC_DEFUN([OVS_CHECK_GROFF], [AC_CACHE_CHECK( |