cifs-utils: support rst2man-3

Commit Message

Alexander Bokovoy July 17, 2018, 8:27 a.m. UTC

On ti, 17 heinä 2018, Aurélien Aptel wrote:
> Alexander Bokovoy <[e-mail]> writes:
> 
> > Hi,
> >
> > Python 3 version of rst2man utility is called rst2man-3. On systems
> > without python 2 bits rst2man is not found. This patch adds support for
> > rst2man-3 so that man pages can still be created.
> 
> It's called rst2man-3.4 here, you probably want to check for that too.
Ok. Added rst2man-{3,3.4,3.6} for completeness.

> >  # 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 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.])
>                                                                                      ^^^^^^^^^^^^^^^^^^^^^^^
> 
> Should be "python" and/or even python(3)-docutils, which doesn't look
> like a base package.
Changed this to python{2,3}-docutils as both py2 and py3 version should
be working.

Comments

Aurélien Aptel July 17, 2018, 10:05 a.m. UTC | #1

Alexander Bokovoy <[e-mail]> writes:
>> It's called rst2man-3.4 here, you probably want to check for that too.
> Ok. Added rst2man-{3,3.4,3.6} for completeness.

Good, thanks!

> / Alexander Bokovoy
> From 6f7af37a5b4b450c5e326d20f2a71423aa55606d Mon Sep 17 00:00:00 2001
> From: Alexander Bokovoy <[e-mail]>
> 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 <[e-mail]>
> ---
>  configure.ac | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> 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)

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.

Cheers,

Patch

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