Skip to contentSkip to conversation

configure: search also for rst2{man, html}.py

PATCH In review Antonio Quartulli 2 participants 3 messages Aug 27, 2021 – Sep 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configure: search also for rst2{man, html}.py

On some systems the rst2{man,html} executables may have a slightly different name, like rst2{man,html}.py.

Add this name variation to the Generic Programs check.

This specific variation is found on Gentoo Linux.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
configure.ac +2 -2
index 5d378962..7c2ead6a 100644
@@ -362,8 +362,8 @@ AC_DEFINE_UNQUOTED([SYSTEMD_ASK_PASSWORD_PATH], ["$SYSTEMD_ASK_PASSWORD"], [Path
 #
 AC_ARG_VAR([RST2MAN], [path to rst2man utility])
 AC_ARG_VAR([RST2HTML], [path to rst2html utility])
-AC_CHECK_PROGS([RST2MAN], [rst2man])
-AC_CHECK_PROGS([RST2HTML], [rst2html])
+AC_CHECK_PROGS([RST2MAN], [rst2man rst2man.py])
+AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py])
 AM_CONDITIONAL([HAVE_PYDOCUTILS], [test "${RST2MAN}" -a "${RST2HTML}"])
 
 # Set -std=c99 unless user already specified a -std=
Signature · 1 line
2.31.1
Acked-by on v1 1/1
#1 lore raw

Tested on my gentoo system, which had symlinks rst2html -> rst2html.py (etc) previously, to work around our configure inflexibility. This now becomes...

..
checking for rst2man... no
checking for rst2man.py... rst2man.py
checking for rst2html... no
checking for rst2html.py... rst2html.py
..
rst2man.py ../../openvpn/doc/openvpn.8.rst > openvpn.8
rst2man.py ../../openvpn/doc/openvpn-examples.5.rst > openvpn-examples.5 rst2html.py ../../openvpn/doc/openvpn.8.rst > openvpn.8.html rst2html.py ../../openvpn/doc/openvpn-examples.5.rst > openvpn-examples.5.html

and doc/openvpn.8 is built properly.

Your patch has been applied to the master branch.

commit b61d1988582feb2e1ed1cf9e62700f484e0bc150

Author: Antonio Quartulli
Date:   Fri Aug 27 16:48:07 2021 +0200
     configure: search also for rst2{man, html}.py

     Signed-off-by: Antonio Quartulli <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg22777.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#2 lore raw

Hi,

Quoted 5 lines · Gert Doering

Tested on my gentoo system, which had symlinks rst2html -> rst2html.py (etc) previously, to work around our configure inflexibility. This now becomes...

[..]

Quoted 3 lines

Your patch has been applied to the master branch.

commit b61d1988582feb2e1ed1cf9e62700f484e0bc150

As discussed at the last community meeting, this is non-intrusive and useful to have in the upcoming 2.5 release.

commit 55f83c9448bf4c36d0b4801e0ef6277952b4a605 (HEAD -> release/2.5)

Author: Antonio Quartulli <[email protected]...>
Date:   Fri Aug 27 16:48:07 2021 +0200

configure: search also for rst2{man, html}.py
...

    (cherry picked from commit b61d1988582feb2e1ed1cf9e62700f484e0bc150)

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...