Skip to content
Snippets Groups Projects
Commit c08102ea authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents cf0597c3 f8dad5a0
No related branches found
No related tags found
No related merge requests found
o Minor features (compilation):
- When building Tor, prefer to use Python 3 over Python 2, and more
recent (contemplated) versions over older ones. Closes ticket 26372.
......@@ -300,7 +300,11 @@ AM_PROG_CC_C_O
AC_PROG_CC_C99
AC_ARG_VAR([PYTHON], [path to Python binary])
AC_CHECK_PROGS(PYTHON, [python python2 python2.7 python3 python3.3])
AC_CHECK_PROGS(PYTHON, [ \
python3 \
python3.8 python3.7 python3.6 python3.5 python3.4 \
python \
python2 python2.7])
if test "x$PYTHON" = "x"; then
AC_MSG_WARN([Python unavailable; some tests will not be run.])
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment