FreeBSD: Add zfs_link_create() error handling

[mirror_zfs.git] / config / always-python.m4

diff --git a/config/always-python.m4 b/config/always-python.m4
index 5f47df424c27641493103833f2417a5a54e8734b..5a2008124f72ae6506f834fa20225b882b254c4a 100644 (file)
--- a/config/always-python.m4
+++ b/config/always-python.m4
@@ -1,7 +1,6 @@
 dnl #
 dnl # The majority of the python scripts are written to be compatible
-dnl # with Python 2.6 and Python 3.4.  Therefore, they may be installed
-dnl # and used with either interpreter.  This option is intended to
+dnl # with Python 3.6. This option is intended to
 dnl # to provide a method to specify the default system version, and
 dnl # set the PYTHON environment variable accordingly.
 dnl #
@@ -13,9 +12,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYTHON], [
                [with_python=check])
 
        AS_CASE([$with_python],
-               [check], [AC_CHECK_PROGS([PYTHON], [python3 python2], [:])],
-               [2*], [PYTHON="python${with_python}"],
-               [*python2*], [PYTHON="${with_python}"],
+               [check], [AC_CHECK_PROGS([PYTHON], [python3], [:])],
                [3*], [PYTHON="python${with_python}"],
                [*python3*], [PYTHON="${with_python}"],
                [no], [PYTHON=":"],
@@ -23,8 +20,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYTHON], [
        )
 
        dnl #
-       dnl # Minimum supported Python versions for utilities:
-       dnl # Python 2.6 or Python 3.4
+       dnl # Minimum supported Python versions for utilities: Python 3.6
        dnl #
        AM_PATH_PYTHON([], [], [:])
        AS_IF([test -z "$PYTHON_VERSION"], [
@@ -33,25 +29,16 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYTHON], [
        PYTHON_MINOR=${PYTHON_VERSION#*\.}
 
        AS_CASE([$PYTHON_VERSION],
-               [2.*], [
-                       AS_IF([test $PYTHON_MINOR -lt 6],
-                               [AC_MSG_ERROR("Python >= 2.6 is required")])
-               ],
                [3.*], [
-                       AS_IF([test $PYTHON_MINOR -lt 4],
-                               [AC_MSG_ERROR("Python >= 3.4 is required")])
+                       AS_IF([test $PYTHON_MINOR -lt 6],
+                               [AC_MSG_ERROR("Python >= 3.6 is required")])
                ],
                [:|2|3], [],
                [PYTHON_VERSION=3]
        )
 
        AM_CONDITIONAL([USING_PYTHON], [test "$PYTHON" != :])
-       AM_CONDITIONAL([USING_PYTHON_2], [test "x${PYTHON_VERSION%%\.*}" = x2])
-       AM_CONDITIONAL([USING_PYTHON_3], [test "x${PYTHON_VERSION%%\.*}" = x3])
-
-       AM_COND_IF([USING_PYTHON_2],
-               [AC_SUBST([PYTHON_SHEBANG], [python2])],
-               [AC_SUBST([PYTHON_SHEBANG], [python3])])
+       AC_SUBST([PYTHON_SHEBANG], [python3])
 
        dnl #
        dnl # Request that packages be built for a specific Python version.