diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-26 09:21:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-26 09:21:59 -0400 |
| commit | d6d3f8486dbac9837a793f431dcd58505e7274e4 (patch) | |
| tree | a8a3d9e465242f5bc06cf60a38cc8f71d0e3520b | |
| parent | 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 (diff) | |
| parent | fcd26af7c0b9926f8e56149a72de9dd47ad37a69 (diff) | |
| download | tor-d6d3f8486dbac9837a793f431dcd58505e7274e4.tar.gz tor-d6d3f8486dbac9837a793f431dcd58505e7274e4.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | changes/feature26372_029 | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/feature26372_029 b/changes/feature26372_029 new file mode 100644 index 0000000000..150ac30555 --- /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 9c079b26ff..7bfbcfccfc 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |