[groff] 03/26: m4/groff.m4 (GROFF_MAKEINFO): Simplify.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 976ccf5118f0d5156d19d10505407a7ecf2a471b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 12 12:50:06 2021 +1100

    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.
---
 ChangeLog   | 9 +++++++++
 m4/groff.m4 | 9 ++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15bb0c0..5c1eef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2021-11-12  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * 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.
+
+2021-11-12  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * m4/groff.m4 (GROFF_HTML_PROGRAMS): Clarify message; it is only
        groff-generated HTML that is disabled by the absence of the
        programs checked for.  (`makeinfo` can still generate our
diff --git a/m4/groff.m4 b/m4/groff.m4
index 353c56a..b2c5c49 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])