[groff] 45/50: [build]: Rename URW-related macros.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9512080bf5b4822cfee7a84d9432f01fae036e65
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat May 21 06:53:21 2022 -0500

    [build]: Rename URW-related macros.
    
    * m4/groff.m4 (GROFF_URW_FONTS_CHECK): Rename this...
      (GROFF_URW_FONTS_NOTICE): ...to this.
    
      (GROFF_URW_FONTS): ...and this...
      (GROFF_URW_FONTS_CHECK): ...to this.
    
      (GROFF_URW_FONTS_NOTICE): Give lengthy notice message a one-line
      summary.
---
 ChangeLog    | 10 ++++++++++
 configure.ac |  4 ++--
 m4/groff.m4  | 12 ++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc256128..10c22cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-05-21  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m4/groff.m4 (GROFF_URW_FONTS_CHECK): Rename this...
+       (GROFF_URW_FONTS_NOTICE): ...to this.
+       (GROFF_URW_FONTS): ...and this...
+       (GROFF_URW_FONTS_CHECK): ...to this.
+       (GROFF_URW_FONTS_NOTICE): Give lengthy notice message a one-line
+       summary.
+       * configure.ac: Update call sites.
+
 2022-05-21  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m4/groff.m4 (GROFF_URW_FONTS): Refactor.  If our prerequisites
diff --git a/configure.ac b/configure.ac
index 3a878b68..fb6c235d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ gl_LOCALCHARSET
 
 # Check for presence of URW fonts (these require Ghostscript, which is
 # checked for by GROFF_CHECK_GROHTML_PROGRAMS).
-GROFF_URW_FONTS
+GROFF_URW_FONTS_CHECK
 
 AM_CONDITIONAL([BUILD_WINSCRIPTS], [test -n "$make_winscripts"])
 
@@ -232,7 +232,7 @@ echo "\
 ----------------------------------------------------------------------"
 
 GROFF_APPRESDIR_CHECK
-GROFF_URW_FONTS_CHECK
+GROFF_URW_FONTS_NOTICE
 GROFF_UCHARDET_CHECK
 GROFF_GHOSTSCRIPT_VERSION_NOTICE
 GROFF_GROHTML_PROGRAM_NOTICE
diff --git a/m4/groff.m4 b/m4/groff.m4
index e386771c..e858bb2b 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -255,7 +255,7 @@ AC_DEFUN([GROFF_URW_FONTS_PATH], [
 # (where font/devpdf/Foundry.in expects them), or in the custom
 # directory passed to 'configure'.
 
-AC_DEFUN([GROFF_URW_FONTS], [
+AC_DEFUN([GROFF_URW_FONTS_CHECK], [
   AC_REQUIRE([GROFF_AWK_PATH])
   AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
   groff_have_urw_fonts=no
@@ -293,13 +293,13 @@ AC_DEFUN([GROFF_URW_FONTS], [
   AC_SUBST([groff_have_urw_fonts])
 ])
 
-AC_DEFUN([GROFF_URW_FONTS_CHECK], [
+AC_DEFUN([GROFF_URW_FONTS_NOTICE], [
   if test "$groff_have_urw_fonts" = no
   then
-    AC_MSG_NOTICE([
-  No URW fonts in Type 1/PFB format were found on your system; URW font
-  generation for groff's 'gropdf' output driver will not work properly.
-  You can obtain the URW base 35 fonts from their GitHub project.
+    AC_MSG_NOTICE([URW fonts in Type 1/PFB format were not found.
+  URW font generation for groff's 'gropdf' output driver will not work
+  properly.  You can obtain the URW base 35 fonts from their GitHub
+  project.
 
   As of this writing (2021-05-15), you can find them in the 'fonts'
   directory of the following archives (choose one).