diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-06-25 15:02:59 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-25 19:34:52 -0400 |
| commit | 449bc79585f324c5695f379def1e57fe9fcec2e6 (patch) | |
| tree | cfe1517c2ca7fa5084701c78cd1a2914d98a5601 | |
| parent | 167c191895d956831f76ece5f2bdbef8cea4ed45 (diff) | |
config: use HAVE_STYLESHEET now defined in XORG_CHECK_SGML_DOCTOOLS
Also use STYLESHEET_SRCDIR XSL_STYLESHEET
This requires version 1.10 of util-macros
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | doc/Makefile.am | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 936e0ae..5ed4864 100644 --- a/configure.ac +++ b/configure.ac @@ -15,16 +15,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.7 for XORG_CHECK_SGML_DOCTOOLS +# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in XORG_CHECK_SGML_DOCTOOLS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.7 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.7) + [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS XORG_ENABLE_DOCS XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) -AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XORG_SGML_PATH" != "x"]) AM_CONFIG_HEADER([config.h]) diff --git a/doc/Makefile.am b/doc/Makefile.am index cd2392e..05f61f7 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -34,9 +34,6 @@ endif CLEANFILES = Xmu.txt Xmu.html Xmu.pdf Xmu.ps xorg.css if HAVE_STYLESHEETS -STYLESHEET_SRCDIR = $(XORG_SGML_PATH)/X11 - -XSL_STYLESHEET = $(STYLESHEET_SRCDIR)/xorg.xsl XMLTO_FLAGS = -m $(XSL_STYLESHEET) doc_DATA += xorg.css |