On ti, 17 heinä 2018, Aurélien Aptel wrote:
> > # if docs are not disabled, check if rst2man is available
> > if test $enable_man != "no"; then
> > - AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
> > + AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no)
>
> You need to use the variable in the Makefile to actually use the prog
> found. It should just be a matter of replacing "rst2man" by
> "$(have_rst2man)" since autoconf already calls AC_SUBST on the var
> according to AC_CHECK_PROGS documentation.
Right. I replaced rst2man in RST2MAN definition in Makefile.am by
$(have_rst2man) and given that we only call for that when CONFIG_MAN is
set, that should complete the change.
New patch is attached.
--
/ Alexander Bokovoy
>From d098b1f3ae1d4c69f34cbe4ec792d0521f35503c Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@xxxxxxxxx>
Date: Tue, 17 Jul 2018 08:22:23 +0300
Subject: [PATCH] configure.ac: support using both rst2man and rst2man-3
Python3 version of rst2man is called rst2man-3.
Add few more variants to cover Fedora and OpenSUSE.
Signed-off-by: Alexander Bokovoy <ab@xxxxxxxxx>
---
Makefile.am | 2 +-
configure.ac | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 30658e3..f37c9ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ man_MANS=
SUFFIXES = .rst .1 .8
-RST2MAN = rst2man --syntax-highlight=none $< $@
+RST2MAN = $(have_rst2man) --syntax-highlight=none $< $@
.rst.1:
$(RST2MAN)
diff --git a/configure.ac b/configure.ac
index b0bc2b9..8e3d6ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,12 +252,12 @@ fi
# if docs are not disabled, check if rst2man is available
if test $enable_man != "no"; then
- AC_CHECK_PROG(have_rst2man, rst2man, yes, no)
+ AC_CHECK_PROGS(have_rst2man, rst2man-3.6 rst2man-3.4 rst2man-3 rst2man, no)
if test $have_rst2man = "no"; then
if test $enable_man = "yes"; then
- AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.])
+ AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils.])
else
- AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing perl. Disabling man page generation.])
+ AC_MSG_WARN([rst2man not found: cannot generate man pages, consider installing python{2,3}-docutils. Disabling man page generation.])
enable_man="no"
fi
else
--
2.17.1
