[6.0] 51c0fc62f Also look for versioned rst2man scripts

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 31 13:08:30 UTC 2018


commit 51c0fc62fcd128f806a17aac9b89cd220ff37a86
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Oct 11 14:26:02 2018 +0000

    Also look for versioned rst2man scripts

diff --git a/configure.ac b/configure.ac
index 7db6f51ea..8794dfaee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,9 @@ AC_PROG_INSTALL
 AC_ARG_WITH([rst2man],
   AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
   [RST2MAN="$withval"],
-  AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]))
+  AC_CHECK_PROGS(RST2MAN,
+    [rst2man rst2man.py rst2man-3.6 rst2man-2.7],
+    [no]))
 if test "x$RST2MAN" = "xno"; then
   AC_MSG_ERROR(
     [rst2man is needed to build Varnish, please install python-docutils.])


More information about the varnish-commit mailing list