commit 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf Merge: 30fa80c0fc 02816d6059 Author: George Kadianakis desnacked@riseup.net Date: Mon Apr 19 17:32:56 2021 +0300

Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5

changes/autoconf-2.70 | 3 +++ configure.ac | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc configure.ac index dfd7a495bb,179e8915b1..a85d530bed --- a/configure.ac +++ b/configure.ac @@@ -437,27 -290,23 +437,31 @@@ AC_PATH_PROG([ASCIIDOC], [asciidoc], no AC_PATH_PROGS([A2X], [a2x a2x.py], none)

AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "xtrue") +AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) +AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"])

AM_PROG_CC_C_O - AC_PROG_CC_C99 + + dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some + dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and + dnl forbidden. + m4_version_prereq([2.70], [:], [AC_PROG_CC_C99])

-AC_ARG_VAR([PYTHON], [path to Python binary]) -AC_CHECK_PROGS(PYTHON, [ \ +AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON], + [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ python3 \ python3.8 python3.7 python3.6 python3.5 python3.4 \ - python \ - python2 python2.7]) + python ], + [["$ac_path_PYTHON" -c 'import sys; sys.exit(sys.version_info[0]<3)' && tor_cv_PYTHON="$ac_path_PYTHON" ac_path_PYTHON_found=:]] )]) +AC_SUBST([PYTHON], [$tor_cv_PYTHON]) + +PYTHON="$tor_cv_PYTHON" + if test "x$PYTHON" = "x"; then - AC_MSG_WARN([Python unavailable; some tests will not be run.]) + tor_incr_n_warnings + AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi + AM_CONDITIONAL(USEPYTHON, [test "x$PYTHON" != "x"])

dnl List all external rust crates we depend on here. Include the version