summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-26 09:21:59 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-26 09:21:59 -0400
commitb4e23dba930cbb8168151e1fe9dcf280615d6f3b (patch)
treedd34b366a67ffb6d51aa548b49c9f0b6f69a0672
parent06f3526b03a7a9462f26515ae7c2dde2b283a3fb (diff)
parentc08102ea777ddaaa8404021a1c8b84082f5eff8b (diff)
downloadtor-b4e23dba930cbb8168151e1fe9dcf280615d6f3b.tar.xz
tor-b4e23dba930cbb8168151e1fe9dcf280615d6f3b.zip
Merge branch 'maint-0.3.4'
-rw-r--r--changes/feature26372_0294
-rw-r--r--configure.ac6
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/feature26372_029 b/changes/feature26372_029
new file mode 100644
index 000000000..150ac3055
--- /dev/null
+++ b/changes/feature26372_029
@@ -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.
diff --git a/configure.ac b/configure.ac
index 30f8e63ec..116a51f7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,7 +290,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