diff options
author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2021-11-12 12:50:06 +1100 |
---|---|---|
committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2021-11-15 09:30:07 +1100 |
commit | 976ccf5118f0d5156d19d10505407a7ecf2a471b (patch) | |
tree | 63ef3abcfaaaceb0465ba49d3b982b95f4c64157 /m4 | |
parent | af7a753dcb99c73ac1056058ddaeea6f0400ecaf (diff) | |
download | groff-git-976ccf5118f0d5156d19d10505407a7ecf2a471b.tar.gz |
m4/groff.m4 (GROFF_MAKEINFO): Simplify.
* m4/groff.m4 (GROFF_MAKEINFO): Stop throwing a warning if the installed
`makeinfo` is old but the distributed Info manual is up to date. This
is not a configure-time problem; the user will be notified when they
run 'make doc'. Empty the `MAKEINFO` variable immediately if a
too-old version is detected. Drop needless `AC_SUBST`itution of the
detected `makeinfo` version.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/groff.m4 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/m4/groff.m4 b/m4/groff.m4 index 353c56a94..b2c5c49a0 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -178,6 +178,7 @@ AC_DEFUN([GROFF_MAKEINFO], expr ${makeinfo_version_major}000 \+ ${makeinfo_version_minor}` if test $makeinfo_version_numeric -lt 5000; then missing="'makeinfo' is too old." + MAKEINFO= fi fi @@ -188,10 +189,6 @@ AC_DEFUN([GROFF_MAKEINFO], || test ${srcdir}/doc/groff.texi -nt ${infofile}; then AC_MSG_ERROR($missing [Get the 'texinfo' package version 5.0 or newer.]) - else - AC_MSG_WARN($missing -[Get the 'texinfo' package version 5.0 or newer if you want to convert -'groff.texi' into a PDF or HTML document.]) fi fi @@ -202,13 +199,11 @@ AC_DEFUN([GROFF_MAKEINFO], make_infodoc= make_install_infodoc= make_uninstall_infodoc= - MAKEINFO= fi AC_SUBST([MAKEINFO]) AC_SUBST([make_infodoc]) AC_SUBST([make_install_infodoc]) - AC_SUBST([make_uninstall_infodoc]) - AC_SUBST([makeinfo_version_numeric])]) + AC_SUBST([make_uninstall_infodoc])]) AC_DEFUN([GROFF_TEXI2DVI], [AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [found], [missing]) |