diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-01-30 13:13:33 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-02-05 11:25:47 -0500 |
| commit | a76488f75f23b8e08763e28b2fa56352e7b04e19 (patch) | |
| tree | a1d2d7cefe272f84cea427afc13cdec8566c8194 | |
| parent | 360f10333ac19f033ea64a8360c4886fbb657890 (diff) | |
doc: use new macros to control doc generation
Namely XORG_WITH_FOP for the fop backend (pdf) and
XORG_ENABLE_DEVEL_DOCS for the generation of all docs
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index d47a551..a22c157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,9 +59,12 @@ dist-hook: ChangeLog INSTALL # Developer documentation - not installed on system EXTRA_DIST += doc/fontlib.xml doc/fontlib.xsl doc/fontlib.css -if MAKE_DEVEL_DOCS +if ENABLE_DEVEL_DOCS if HAVE_XMLTO noinst_DATA = doc/fontlib.txt doc/fontlib.html $(srcdir)/doc/fontlib.css +if HAVE_FOP +noinst_DATA += doc/fontlib.pdf doc/fontlib.ps +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 @@ -71,9 +74,9 @@ doc/fontlib.html: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc xhtml-nochunks $(srcdir)/doc/fontlib.xml doc/fontlib.pdf: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl - $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml + $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc pdf $(srcdir)/doc/fontlib.xml doc/fontlib.ps: $(srcdir)/doc/fontlib.xml $(srcdir)/doc/fontlib.xsl - $(AM_V_GEN)$(XMLTO) -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml + $(AM_V_GEN)$(XMLTO) --with-fop -m $(srcdir)/doc/fontlib.xsl -o doc ps $(srcdir)/doc/fontlib.xml endif HAVE_XMLTO -endif MAKE_DEVEL_DOCS +endif ENABLE_DEVEL_DOCS diff --git a/configure.ac b/configure.ac index 6e39c1d..8edeba0 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,12 @@ AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.5) + [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.6) XORG_DEFAULT_OPTIONS +XORG_ENABLE_DEVEL_DOCS XORG_WITH_XMLTO +XORG_WITH_FOP # Check for progs AC_PROG_CC @@ -51,13 +53,6 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config dnl must first be located explicitly. PKG_PROG_PKG_CONFIG -# Option to enable support for building developer internals docs -AC_ARG_ENABLE(devel-docs, - AS_HELP_STRING([--enable-devel-docs], - [Build internals documentation for developers (default: enabled)]), - [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes]) -AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"]) - # Look for headers AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) AC_CHECK_FUNCS([poll]) |