diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-05-20 15:16:44 -0500 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2022-05-21 11:13:08 -0500 |
| commit | 72d251b9c58e5a5211ff72e05b064604c347646e (patch) | |
| tree | 048a104cdebb4f535f806b5465690a9fb6c56c20 /contrib/sboxes | |
| parent | aa5787c1eb1b388ab246a02cdbf2d9267e701494 (diff) | |
| download | groff-git-72d251b9c58e5a5211ff72e05b064604c347646e.tar.gz | |
[build]: Refactor gropdf runtime-dep check.
Handle missing programs required to construct files needed at runtime by
gropdf more gracefully. Rename and refactor configuration-time logic to
be more understandable.
* configure.ac:
* m4/groff.m4: Rename `GROFF_PDFDOC_PROGRAMS` macro to
`GROFF_CHECK_GROPDF_PROGRAMS`. Rename shell variable `make_pdfdoc` to
`use_gropdf`. Set it explicitly to "no" or "yes" instead of null or
not null.
* configure.ac:
* m4/groff.m4:
* doc/doc.am:
* contrib/mom/mom.am:
* contrib/pdfmark/pdfmark.am:
* contrib/sboxes/sboxes.am: Rename `BUILD_PDFDOC` to `USE_GROPDF`.
* configure.ac: Call `GROFF_GROPDF_PROGRAM_NOTICE`.
* doc/doc.am: Bracket definition of `PROCESSEDDOCFILES_PDF` macro and
`$(PROCESSEDDOCFILES_PDF)` dependency declaration in Automake `if
USE_GROPDF` conditional. This prevents attempts to build PDF
documents using groff that are doomed to fail.
* m4/groff.m4: Refactor gropdf runtime-dependency program check. Split
into two macros: one (`GROFF_CHECK_GROPDF_PROGRAMS`) performs the
check, the other (`GROFF_GROPDF_PROGRAM_NOTICE`) issues a notice at
the end of the configuration process if at least one program was not
found. Rename `docnote` shell variable to `gropdf_notice`. Tighten
wording of notice. Drop unused `make_install_pdfdoc` and
`make_uninstall_pdfdoc` shell variables.
Also make code style more readable.
Diffstat (limited to 'contrib/sboxes')
| -rw-r--r-- | contrib/sboxes/ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/sboxes/sboxes.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/sboxes/ChangeLog b/contrib/sboxes/ChangeLog index 198f7c77f..6d90d65c6 100644 --- a/contrib/sboxes/ChangeLog +++ b/contrib/sboxes/ChangeLog @@ -1,3 +1,7 @@ +2022-05-20 G. Branden Robinson <g.branden.robinson@gmail.com> + + * sboxes.am: Rename `BUILD_PDFDOC` to `USE_GROPDF`. + 2022-05-01 G. Branden Robinson <g.branden.robinson@gmail.com> * sboxes.am ($(sboxes_builddir)/msboxes.pdf): Depend on new name diff --git a/contrib/sboxes/sboxes.am b/contrib/sboxes/sboxes.am index 3c202fe12..cbab2a479 100644 --- a/contrib/sboxes/sboxes.am +++ b/contrib/sboxes/sboxes.am @@ -33,7 +33,7 @@ SBOXES_EXAMPLEFILES = $(sboxes_srcdir)/msboxes.ms.in sboxesotherdocdir = $(docdir) nodist_sboxesotherdoc_DATA = $(sboxes_builddir)/msboxes.ms -if BUILD_PDFDOC +if USE_GROPDF sboxespdfdocdir = $(pdfdocdir) nodist_sboxespdfdoc_DATA = $(sboxes_builddir)/msboxes.pdf endif |