gbranden pushed a commit to branch master
in repository groff.
commit c41b8ce7fc8ba507ded9f0c606b0346ee769091b
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Sep 19 16:19:11 2022 -0500
[m4]: Fix Savannah #62775.
* m4/groff.m4 (GROFF_URW_FONTS_CHECK): If Ghostscript or awk are
unavailable, skip only the prepopulation of the URW font search path
instead of the entire check. This way we still locate the URW fonts
if they are in one of several standard locations.
Fixes <https://savannah.gnu.org/bugs/?62775>.
This commit does _not_ update indentation, for clarity.
---
ChangeLog | 9 +++++++++
m4/groff.m4 | 6 ++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff3eae867..6230dc99c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-19 G. Branden Robinson <[email protected]>
+
+ * m4/groff.m4 (GROFF_URW_FONTS_CHECK): If Ghostscript or awk are
+ unavailable, skip only the prepopulation of the URW font search
+ path instead of the entire check. This way we still locate the
+ URW fonts if they are in one of several standard locations.
+
+ Fixes <https://savannah.gnu.org/bugs/?62775>.
+
2022-09-19 G. Branden Robinson <[email protected]>
[troff]: Trivially refactor.
diff --git a/m4/groff.m4 b/m4/groff.m4
index 3d1cb1aee..ffdcd1da8 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -295,10 +295,13 @@ AC_DEFUN([GROFF_URW_FONTS_CHECK], [
AC_REQUIRE([GROFF_AWK_PATH])
AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
groff_have_urw_fonts=no
+ AC_MSG_CHECKING([for URW fonts in Type 1/PFB format])
+ _list_paths=
+
if test "$AWK" != missing && test "$GHOSTSCRIPT" != missing
then
- AC_MSG_CHECKING([for URW fonts in Type 1/PFB format])
_list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ {
found = 1 } /^[ ]*\// { print $'0' }'| tr : ' '`
+ fi
_list_paths="$_list_paths \
/usr/share/fonts/type1/gsfonts/ \
/usr/share/fonts/default/Type1/ \
@@ -330,7 +333,6 @@ AC_DEFUN([GROFF_URW_FONTS_CHECK], [
then
AC_MSG_RESULT([none found])
fi
- fi
AC_SUBST([groff_have_urw_fonts])
])
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
