[groff] 08/23: [gropdf]: Fix Savannah #63824 (2/2).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 2706c735b3c89411d2bcf6e8c31ec8796feab174
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Feb 21 18:57:58 2023 -0600

    [gropdf]: Fix Savannah #63824 (2/2).
    
    [gropdf]: Revise tests to run unconditionally, rather than configuring
    them away at build time, which can cause a distribution archive to be
    incorrectly structured.  Update configuration notices when optional
    dependencies are absent.
    
    * font/devpdf/devpdf.am (font_devpdf_TESTS): Remove `USE_GROPDF` and
      `HAVE_URW_FONTS` conditionals.
    
    * m4/groff.m4 (GROFF_GROPDF_PROGRAM_NOTICE, GROFF_URW_FONTS_NOTICE):
      Warn reader that a gropdf test failure is to be expected.
    
    Fixes <https://savannah.gnu.org/bugs/?63824> (2/2).
    
    ANNOUNCE: Update bug counts.
---
 ANNOUNCE              |  6 +++---
 ChangeLog             | 15 +++++++++++++++
 font/devpdf/devpdf.am |  9 +++------
 m4/groff.m4           | 31 ++++++++++++++++++-------------
 4 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 31cf029a9..d8f35e032 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -54,7 +54,7 @@ release shipped with three automated unit tests; this one 
ships with
 over 160 unit and regression tests.
 
 As of this writing, per the GNU Savannah bug tracker, the groff project
-has resolved 417 problems as fixed for the 1.23.0 release.  Some of the
+has resolved 418 problems as fixed for the 1.23.0 release.  Some of the
 bugs we've corrected were over 30 years old.
 
 Classifying these issues by type and the component of the project to
@@ -69,9 +69,9 @@ which they apply, we find the following.
   Incorrect behavior          129   Driver: grotty                  4
   Lint                         15   Driver: others/general          8
   Rendering/cosmetics          10   Font: devpdf                    1
-  Test                          4   Font: devps                     3
+  Test                          5   Font: devps                     3
   Warning/suspicious behavior  67   Font: others/general            4
-                                    General                        48
+                                    General                        49
                                     Macros: man                    33
                                     Macros: mdoc                   13
                                     Macros: me                     36
diff --git a/ChangeLog b/ChangeLog
index ebd9bf6e3..cd2dafde6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2023-02-21  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [gropdf]: Revise tests to run unconditionally, rather than
+       configuring them away at build time, which can cause a
+       distribution archive to be incorrectly structured.  Update
+       configuration notices when optional dependencies are absent.
+
+       * font/devpdf/devpdf.am (font_devpdf_TESTS): Remove `USE_GROPDF`
+       and `HAVE_URW_FONTS` conditionals.
+       * m4/groff.m4 (GROFF_GROPDF_PROGRAM_NOTICE):
+       (GROFF_URW_FONTS_NOTICE): Warn reader that a gropdf test failure
+       is to be expected.
+
+       Fixes <https://savannah.gnu.org/bugs/?63824> (2/2).
+
 2023-02-21  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [grohtml]: Revise tests to check for requisite programs at test
diff --git a/font/devpdf/devpdf.am b/font/devpdf/devpdf.am
index ddf34e625..4b872182d 100644
--- a/font/devpdf/devpdf.am
+++ b/font/devpdf/devpdf.am
@@ -178,12 +178,9 @@ uninstall_devpdf:
          rmdir $(DESTDIR)$(devpdffontdir); \
        fi
 
-if USE_GROPDF
-font_devpdf_TESTS = font/devpdf/tests/check-default-foundry.sh
-if HAVE_URW_FONTS
-font_devpdf_TESTS += font/devpdf/tests/check-urw-foundry.sh
-endif
-endif
+font_devpdf_TESTS = \
+  font/devpdf/tests/check-default-foundry.sh \
+  font/devpdf/tests/check-urw-foundry.sh
 
 TESTS += $(font_devpdf_TESTS)
 EXTRA_DIST += $(font_devpdf_TESTS)
diff --git a/m4/groff.m4 b/m4/groff.m4
index af2ddfdcd..b6c5535be 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -325,13 +325,15 @@ AC_DEFUN([GROFF_GROPDF_PROGRAM_NOTICE], [
   then
     AC_MSG_NOTICE(['gropdf' will have reduced function.
 
-  Because neither Ghostscript nor URW fonts are available, groff
-  documentation will not be available in PDF.
+  Neither Ghostscript nor URW fonts are available; groff documentation
+  thus will not be available in PDF.
 
   'gropdf' will be able to handle only documents using the standard PDF
   base 14 fonts, plus the 'EURO' font groff supplies, and font embedding
   with its '-e' option (accessed via the 'groff' command with the option
   '-P -e') will not be possible.
+
+  If you run "make check", an automated test for 'gropdf' will fail.
 ])
   fi
 ])
@@ -363,6 +365,7 @@ AC_DEFUN([GROFF_URW_FONTS_CHECK], [
     _list_paths=`$GHOSTSCRIPT -h | $AWK 'BEGIN { found = 0 } /Search path:/ { 
found = 1 } /^[ ]*\// { print $'0' }'| tr : ' '`
   fi
 
+dnl Keep this list in sync with font/devpdf/Foundry.in.
   _list_paths="$_list_paths \
     /usr/share/fonts/type1/gsfonts/ \
     /usr/share/fonts/default/Type1/ \
@@ -409,12 +412,16 @@ AC_DEFUN([GROFF_URW_FONTS_NOTICE], [
   then
     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.
+  groff font description files for the URW fonts, used by the 'gropdf'
+  output driver, will not be available.  Use and embedding of fonts from
+  the 'U' foundry in PDF documents generated by groff will not be
+  possible.
+
+  If you run "make check", an automated test for 'gropdf' will fail.
 
-  As of this writing (2023-02-15), you can find them in the 'fonts'
-  directory of the following archives (choose one).
+  You can obtain the URW base 35 fonts from their GitHub project.  As of
+  this writing (2023-02-15), you can find them in the 'fonts' directory
+  of the following archives (choose one).
 
     https://github.com/ArtifexSoftware/urw-base35-fonts/archive/refs/
       tags/20200910.zip
@@ -426,12 +433,10 @@ AC_DEFUN([GROFF_URW_FONTS_NOTICE], [
     https://github.com/ArtifexSoftware/urw-base35-fonts/releases
 
   By default, groff will look for these fonts in the search path shown
-  by the 'gs -h' command (if available) and in the two directories
-    /usr/share/fonts/type1/gsfonts/
-  and
-    /opt/local/share/fonts/urw-fonts/
-  (these locations are specified in font/devpdf/Foundry.in).  You will
-  need to re-run the 'configure' script after installing these fonts.
+  by the 'gs -h' command (if available) and in several directories
+  specified in font/devpdf/Foundry.in).  You will need to 'make
+  distclean' and re-run the 'configure' script after installing these
+  fonts.
 
   Alternatively, you can pass the option '--with-urw-fonts-dir=DIR'
   to 'configure' to look for them in the directory DIR you specify.