nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-26 09:21:59 -04:00
commit f8dad5a079
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/feature26372_029 Normal file
View File

@ -0,0 +1,4 @@
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.

6
configure.ac
View File

@ -268,7 +268,11 @@ AM_PROG_CC_C_O
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_ARG_VAR([PYTHON], [path to Python binary]) 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 if test "x$PYTHON" = "x"; then
AC_MSG_WARN([Python unavailable; some tests will not be run.]) AC_MSG_WARN([Python unavailable; some tests will not be run.])
fi fi