| Message ID | 20210827144807.27004-1-a@unstable.cc |
|---|---|
| State | Accepted |
| Delegated to: | David Sommerseth |
| Headers | show |
| Series | [Openvpn-devel] configure: search also for rst2{man, html}.py | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> 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 <a@unstable.cc> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20210827144807.27004-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22777.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
Hi, On Mon, Sep 13, 2021 at 12:03:32PM +0200, Gert Doering wrote: > Acked-by: Gert Doering <gert@greenie.muc.de> > > Tested on my gentoo system, which had symlinks rst2html -> rst2html.py > (etc) previously, to work around our configure inflexibility. This > now becomes... [..] > 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 <a@unstable.cc> Date: Fri Aug 27 16:48:07 2021 +0200 configure: search also for rst2{man, html}.py ... (cherry picked from commit b61d1988582feb2e1ed1cf9e62700f484e0bc150) gert
diff --git a/configure.ac b/configure.ac index 5d378962..7c2ead6a 100644 --- a/configure.ac +++ b/configure.ac @@ -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=
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. Cc: David Sommerseth <davids@openvpn.net> Signed-off-by: Antonio Quartulli <a@unstable.cc> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)