diff options
| author | Alexander Bokovoy <ab@samba.org> | 2018-07-17 13:12:44 +0300 |
|---|---|---|
| committer | Pavel Shilovsky <pshilov@microsoft.com> | 2018-08-17 11:01:35 -0700 |
| commit | a389756f51916995d27819ea1807ab03f36d8dd7 (patch) | |
| tree | 787c0d4b23888229386a0407c1711dea99b197a5 | |
| parent | 7325a01abc529d68756bae90cf23233392626939 (diff) | |
| download | cifs-utils-a389756f51916995d27819ea1807ab03f36d8dd7.tar.gz cifs-utils-a389756f51916995d27819ea1807ab03f36d8dd7.tar.bz2 cifs-utils-a389756f51916995d27819ea1807ab03f36d8dd7.zip | |
cifs-utils: support rst2man-3
Python3 version of rst2man is called rst2man-3
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | 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 |