diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-09-19 16:19:11 -0500 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-09-25 15:47:11 -0500 |
| commit | c41b8ce7fc8ba507ded9f0c606b0346ee769091b (patch) | |
| tree | 8643d79013b611d8170f342ab8f2ad0da1706498 /m4/groff.m4 | |
| parent | 8c53f0c6294927684d5272c5a64c55f251d321f3 (diff) | |
| download | groff-git-c41b8ce7fc8ba507ded9f0c606b0346ee769091b.tar.gz | |
[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.
Diffstat (limited to 'm4/groff.m4')
| -rw-r--r-- | m4/groff.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
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]) ]) |