[master] bfab0a1 check for python >= 2.7
Nils Goroll
nils.goroll at uplex.de
Mon Feb 20 15:02:06 CET 2017
commit bfab0a1ffa174b8c59ac5ed2f3f38a18ee7afe61
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Feb 20 15:00:00 2017 +0100
check for python >= 2.7
a29fca70f7ccc75964bcfffb8c8ab1617fcf2bba requires subprocess.check_output
which was added with Python 2.7
diff --git a/configure.ac b/configure.ac
index 7c46d40..3f057e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -345,11 +345,20 @@ else
fi
AM_MISSING_HAS_RUN
-AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 python2.5 python2 python], "no")
+AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2 python], "no")
if test "x$PYTHON" = "xno"; then
- AC_MSG_ERROR([Python is needed to build Varnish, please install python.])
+ AC_MSG_ERROR([Python is needed to build Varnish, please install python 2.7 or later.])
fi
+py_ver=`"$PYTHON" -V 2>&1`
+case "$py_ver" in
+Python?3.* | Python?2.[7-9].*)
+ ;;
+*)
+ AC_MSG_ERROR([Python >= 2.7 is required])
+ ;;
+esac
+
AC_CHECK_DECL([SO_ACCEPTFILTER],
AC_DEFINE(HAVE_ACCEPT_FILTERS,1,[Define to 1 if you have accept filters]),
,
More information about the varnish-commit
mailing list