summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac6
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