[master] 8e5236859 Prefer Python 3 tools

Federico G. Schwindt fgsch at lodoss.net
Sun May 26 10:30:14 UTC 2019

commit 8e5236859fd08b366dd881b187f0b177dcb82342
Author: Klemens Nanni <kn at openbsd.org>
Date:   Tue May 14 17:43:57 2019 +0200

    Prefer Python 3 tools
    The last three commits already made configure recommend installing
    Python 3 packages and look for versioned executables, however with a low
    This is a problem on systems such as OpenBSD 6.5 with a default Python
    version at 2.7, where 3.7 flavored Python packages get installed with
    a "-3" binary suffix.  That is, when both rst2man and rst2man-3 are
    installed at configure time, the lower version will be picked unless
    explicitly passed through `--with-feature' arguments.
    Regardless of this specific case, trying more specificly versioned tool
    names first seems correctly in line with recent development and less
    error prone, so change it accordingly.

diff --git a/configure.ac b/configure.ac
index fe4225069..fbfea3e45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_ARG_WITH([rst2man],
   AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
-    [rst2man rst2man.py rst2man-3.6 rst2man-3],
+    [rst2man-3.6 rst2man-3 rst2man rst2man.py],
 if test "x$RST2MAN" = "xno"; then
@@ -52,7 +52,7 @@ AC_ARG_WITH([sphinx-build],
   AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
-    [sphinx-build sphinx-build-3.6 sphinx-build-3],
+    [sphinx-build-3.6 sphinx-build-3 sphinx-build],
 if test "x$SPHINX" = "xno"; then
@@ -63,7 +63,7 @@ AC_ARG_WITH([rst2html],
   AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
-     [rst2html rst2html.py rst2html-3.6 rst2html-3],
+     [rst2html-3.6 rst2html-3 rst2html rst2html.py],
 if test "x$RST2HTML" = "xno"; then

More information about the varnish-commit mailing list