[groff] 12/16: [build]: Rename some groff Autoconf macros.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit c5fe430a770ebb053aea0676bad14b9442dcd01d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Jun 8 04:07:46 2022 -0500

    [build]: Rename some groff Autoconf macros.
    
    ... to better match Autoconf's own naming conventions.
    
    * m4/groff.m4 (GROFF_MAKEINFO): Rename to...
    (GROFF_PROG_MAKEINFO): ...this.
    (GROFF_TEXI2DVI): Rename to...
    (GROFF_PROG_TEXI2DVI): ...this.
    
    * configure.ac:
    * m4/groff.m4 (GROFF_TEXI2DVI): Update call sites.
---
 ChangeLog    | 13 +++++++++++++
 configure.ac |  4 ++--
 m4/groff.m4  |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66e729fc..8e6c3840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-06-08  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [build]: Rename some groff Autoconf macros to better match
+       Autoconf's own naming conventions.
+
+       * m4/groff.m4 (GROFF_MAKEINFO): Rename to...
+       (GROFF_PROG_MAKEINFO): ...this.
+       (GROFF_TEXI2DVI): Rename to...
+       (GROFF_PROG_TEXI2DVI): ...this.
+
+       * configure.ac:
+       * m4/groff.m4 (GROFF_TEXI2DVI): Update call sites.
+
 2022-06-07  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/an.tmac (SH, SS, B, I, SM, SB): Set input trap with `it`
diff --git a/configure.ac b/configure.ac
index 26a24366..b2d6df94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,8 @@ GROFF_REFERDIR_DEFAULT
 AC_PROG_EGREP
 GROFF_PROG_YACC
 GROFF_PROG_M4
-GROFF_MAKEINFO
-GROFF_TEXI2DVI
+GROFF_PROG_MAKEINFO
+GROFF_PROG_TEXI2DVI
 AC_PROG_RANLIB
 GROFF_INSTALL_SH
 GROFF_INSTALL_INFO
diff --git a/m4/groff.m4 b/m4/groff.m4
index c3de8cb6..44b15012 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -105,7 +105,7 @@ AC_DEFUN([GROFF_PROG_M4], [
 # We need makeinfo from Texinfo 5.0 or newer, for @codequoteundirected.
 # The minor version checking logic is present for future needs.
 
-AC_DEFUN([GROFF_MAKEINFO], [
+AC_DEFUN([GROFF_PROG_MAKEINFO], [
   if ! test -f "$srcdir"/.tarball-version
   then
   # By default automake will set MAKEINFO to MAKEINFO = ${SHELL} <top
@@ -154,10 +154,10 @@ AC_DEFUN([GROFF_MAKEINFO], [
 # 'makeinfo' and 'texi2dvi' are distributed together, so if the former
 # is too old, the latter is too.
 
-AC_DEFUN([GROFF_TEXI2DVI], [
+AC_DEFUN([GROFF_PROG_TEXI2DVI], [
   if ! test -f "$srcdir"/.tarball-version
   then
-    AC_REQUIRE([GROFF_MAKEINFO])
+    AC_REQUIRE([GROFF_PROG_MAKEINFO])
     AC_CHECK_PROG([PROG_TEXI2DVI], [texi2dvi], [texi2dvi], [missing])
     groff_have_texi2dvi=no
     if test "$PROG_TEXI2DVI" != missing && test -n "$MAKEINFO"