Merge branch 't/30546/build/py3x_conf' into t/30184/support_python_3_9

sagemath · Sep 25, 2020 · 4f7d588 · 4f7d588
2 parents 8c756ed + f19d9a4
commit 4f7d588
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4
@@ -20,8 +20,8 @@ SAGE_SPKG_CONFIGURE([python3], [
       AC_CACHE_CHECK([for python3 >= ]MIN_VERSION[, < ]LT_VERSION[ with modules $check_modules], [ac_cv_path_PYTHON3], [
         AS_IF([test x"$ac_path_PYTHON3" != x], [dnl checking explicitly specified $with_python
            AC_MSG_RESULT([])
-           AC_PATH_PROGS_FEATURE_CHECK([PYTHON3], [$ac_path_PYTHON3], [
-                SAGE_CHECK_PYTHON_FOR_VENV([$ac_path_PYTHON3],
+           AC_PATH_PROG([ac_path_PYTHON3], [$ac_path_PYTHON3])
+           SAGE_CHECK_PYTHON_FOR_VENV([$ac_path_PYTHON3],
                                            MIN_VERSION, LT_VERSION,
                                            $check_modules, [
                     dnl It is good
@@ -30,7 +30,6 @@ SAGE_SPKG_CONFIGURE([python3], [
                     AC_MSG_RESULT([yes])
                     dnl introduction for AC_MSG_RESULT printed by AC_CACHE_CHECK
                     AC_MSG_CHECKING([for python3 >= ]MIN_VERSION[, < ]LT_VERSION[ with modules $check_modules])
-                ])
            ])
            AS_IF([test -z "$ac_cv_path_PYTHON3"], [
                AC_MSG_ERROR([the python3 selected using --with-python=$with_python is not suitable])