[master] c22d8f777 Require Python >= 3.4 at build time

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Mar 12 10:00:14 UTC 2019


commit c22d8f777c35a2c6f0a8939680e0db732a4ec3ad
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Mar 12 10:28:35 2019 +0100

    Require Python >= 3.4 at build time
    
    Until the naked "python" executable refers to python3 (currently it is
    still python2) it now takes lower precedence.

diff --git a/varnish-legacy.m4 b/varnish-legacy.m4
index e5e2821eb..9f67359ea 100644
--- a/varnish-legacy.m4
+++ b/varnish-legacy.m4
@@ -98,9 +98,10 @@ AC_SUBST([VMOD_DIR])
 
 AC_DEFUN([VARNISH_VMODTOOL],
 [
-AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 python2.5 python2 python], "no")
+AC_CHECK_PROGS(PYTHON, [python3.9 python3.8 python3.7 python3.6 python3.5 dnl
+  python3.4 python3 python, "no"])
 if test "x$PYTHON" = "xno"; then
-  AC_MSG_ERROR([Python is needed to build, please install python.])
+  AC_MSG_ERROR([Python >= 3.4 is needed to build, please install python.])
 fi
 VARNISH_PKG_GET_VAR([VMODTOOL], [vmodtool])
 AC_SUBST([VMODTOOL])
diff --git a/varnish.m4 b/varnish.m4
index 71df96d9c..392c36c60 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -130,10 +130,10 @@ AC_DEFUN([_VARNISH_CHECK_DEVEL], [
 # ---------------------
 AC_DEFUN([_VARNISH_CHECK_PYTHON], [
 	m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-[python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python2.7 dnl
-python python2 python3])
-	AM_PATH_PYTHON([2.7], [], [
-		AC_MSG_ERROR([Python >= 2.7 is required.])
+		[python3.9 python3.8 python3.7 python3.6 python3.5 dnl
+		python3.4 python3 python])
+	AM_PATH_PYTHON([3.4], [], [
+		AC_MSG_ERROR([Python >= 3.4 is required.])
 	])
 
 ])


More information about the varnish-commit mailing list