Skip text format when XMLTO dependencies for text format are missing (lynx, links or w3m)
This requires version 1.10 of util-macros. Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 10 +++++++++- configure.ac | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index d4e330b..c66d5c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,10 +60,17 @@ EXTRA_DIST = doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css if ENABLE_DEVEL_DOCS if HAVE_XMLTO -noinst_DATA = doc/fontlib.txt doc/fontlib.html + +noinst_DATA = doc/fontlib.html + if HAVE_FOP noinst_DATA += doc/fontlib.pdf doc/fontlib.ps endif + +if HAVE_XMLTO_TEXT +noinst_DATA += doc/fontlib.txt +endif + CLEANFILES = doc/fontlib.txt doc/fontlib.html doc/fontlib.pdf doc/fontlib.ps doc/fontlib.txt: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl @@ -77,5 +84,6 @@ doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml + endif HAVE_XMLTO endif ENABLE_DEVEL_DOCS diff --git a/configure.ac b/configure.ac index 49f1d06..f068be2 100644 --- a/configure.ac +++ b/configure.ac @@ -37,10 +37,10 @@ dnl AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Initialize X.Org macros 1.10 or later for HAVE_XMLTO_TEXT set by XORG_WITH_XMLTO 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.10 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.10) XORG_DEFAULT_OPTIONS XORG_ENABLE_DEVEL_DOCS XORG_WITH_XMLTO(0.0.20) -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
