[groff] 02/03: m4/groff.m4 (GROFF_URW_FONTS): Match newer names.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 39de1019dec24631f204f72a434b62a56f384b9c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat May 15 09:42:01 2021 +1000

    m4/groff.m4 (GROFF_URW_FONTS): Match newer names.
    
    * m4/groff.m4 (GROFF_URW_FONTS): Update configure script check for URW
      fonts to recognize recent releases of the URW Base 35 fonts from
      Artifex Software.  Look for the AR (Arial roman equivalent) font under
      all of the names recognized by fonts/devpdf/Foundry.in.
    
    Also tighten and generalize wording of checking message; these days it
    is misleading to suggest that people must find fonts with a .pfb suffix.
---
 ChangeLog   |  8 ++++++++
 m4/groff.m4 | 27 +++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6157210..1a41bed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-15  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m4/groff.m4 (GROFF_URW_FONTS): Update configure script check
+       for URW fonts to recognize recent releases of the URW Base 35
+       fonts from Artifex Software.  Look for the AR (Arial roman
+       equivalent) font under all of the names recognized by
+       fonts/devpdf/Foundry.in.
+
 2021-05-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/groff.texi (ms Document Control Settings) <DI>:
diff --git a/m4/groff.m4 b/m4/groff.m4
index 9231f9f..fc1c0d1 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -347,12 +347,13 @@ AC_DEFUN([GROFF_URW_FONTS_PATH],
      [urwfontsdir="$withval"])
    AC_SUBST(urwfontsdir)])
 
-# Check if URW fonts are available, either in the paths given by `gs
-# -h', in /usr/share/fonts/type1/gsfonts/ ,
-# /opt/local/share/fonts/urw-fonts (where font/devpdf/Foundry.in
-# expect them), or in the custom path passed to configure.
+# Check availability of URW fonts in the search path given by 'gs -h'
+# supplemented with
+# /usr/share/fonts/type1/gsfonts/:/opt/local/share/fonts/urw-fonts
+# (where font/devpdf/Foundry.in expects them), or in the custom
+# directory passed to 'configure'.
 AC_DEFUN([GROFF_URW_FONTS],
-  [AC_MSG_CHECKING([whether URW fonts in pfb format are available])
+  [AC_MSG_CHECKING([for URW fonts in Type 1/PFB format])
    AC_REQUIRE([GROFF_AWK_PATH])
    AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
    groff_have_urw_fonts=no
@@ -366,11 +367,17 @@ AC_DEFUN([GROFF_URW_FONTS],
        _list_paths="$ _list_paths $urwfontsdir"
      fi
      for k in $_list_paths; do
-       if test -f $k/a010013l.pfb; then
-         AC_MSG_RESULT([found in $k])
-         groff_have_urw_fonts=yes
-         break
-       fi
+       for _font_file in \
+         URWGothic-Book.t1 \
+         URWGothic-Book.pfb \
+         URWGothicL-Book.pfb \
+         a010013l.pfb; do
+         if test -f $k/$_font_file; then
+           AC_MSG_RESULT([found in $k])
+           groff_have_urw_fonts=yes
+           break 2
+         fi
+       done
      done
    fi
    if test $groff_have_urw_fonts = no; then