Commit 25226fb2 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.1' into maint-0.3.2

parents 6107a212 d6d3f848

changes/feature26372_029

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

configure.ac

+5 −1
Original line number Diff line number Diff line
@@ -248,7 +248,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