diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-06-18 21:47:52 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-25 15:51:11 -0400 |
| commit | 4f557036253ac5750576c88e5b9a86759a49d247 (patch) | |
| tree | 220caae6a2d4010eb90c60e618b615f963d63982 | |
| parent | 1e9b958a096682b1ec111d400bd25048e3f95ed4 (diff) | |
config: XORG_WITH_GROFF: use HAVE_GROFF_HTML conditional
Groff uses grohtml to generate html output format. This program, in turn,
uses a number of pnm* commands from the netpbm package, psselect
from the psutils package and the ghostscript package.
These are independently installed, so they could be missing.
Skip the HTML output format if one of the dependencies is missing.
The version 1.9 of the util-macros package is required.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 928614c..493bcc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,8 +42,11 @@ printable_format = .ps endif doc_DATA = $(doc_sources:.mm=.txt) \ - $(doc_sources:.mm=$(printable_format)) \ - $(doc_sources:.mm=.html) + $(doc_sources:.mm=$(printable_format)) + +if HAVE_GROFF_HTML +doc_DATA += $(doc_sources:.mm=.html) +endif CLEANFILES = $(doc_DATA) MOSTLYCLEANFILES = index.* diff --git a/configure.ac b/configure.ac index 6dad5a2..1f22f0f 100644 --- a/configure.ac +++ b/configure.ac @@ -25,10 +25,10 @@ AC_INIT(xtrans, [1.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macrosr: XORG_DEFAULT_OPTIONS +# Require xorg-macros: XORG_WITH_GROFF for HAVE_GROFF_HTML m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.6) + [m4_fatal([must install xorg-macros 1.9 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.9) XORG_DEFAULT_OPTIONS XORG_ENABLE_DOCS XORG_WITH_GROFF |