[PATCH xorg-docs 1/3] config: use XORG_CHECK_DOCBOOK macro as is.

Gaetan Nadon memsize at videotron.ca
Mon Sep 13 11:39:00 PDT 2010


Only a few sgml files are left to be converted to DocBook XML.
The new doc macros in util-macros will, by default, build all
formats unless the tool to do the job is not found. This
is what XORG_CHECK_DOCBOOK does as well.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2587a28..5be7a2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,23 +46,6 @@ AC_ARG_WITH(x11docdir,
         [X11DOCDIR="$DEFAULT_X11DOCDIR"])
 AC_SUBST([X11DOCDIR])
 
-AC_ARG_ENABLE(txt, AS_HELP_STRING([--enable-txt],
-                [Build TXT versions of documents (default: enabled)]),
-                [BUILD_TXTDOC=$enableval], [BUILD_TXTDOC=yes])
-AC_ARG_ENABLE(pdf, AS_HELP_STRING([--enable-pdf],
-                [Build PDF versions of documents (default: enabled)]),
-                [BUILD_PDFDOC=$enableval], [BUILD_PDFDOC=yes])
-AC_ARG_ENABLE(ps, AS_HELP_STRING([--enable-ps],
-                [Build PostScript versions of documents (default: disabled)]),
-                [BUILD_PSDOC=$enableval], [BUILD_PSDOC=no])
-AC_ARG_ENABLE(html, AS_HELP_STRING([--enable-html],
-                [Build HTML versions of documents (default: disabled)]),
-                [BUILD_HTMLDOC=$enableval], [BUILD_HTMLDOC=no])
-
-AM_CONDITIONAL(BUILD_TXTDOC, test "x$BUILD_TXTDOC" = xyes)
-AM_CONDITIONAL(BUILD_PDFDOC, test "x$BUILD_PDFDOC" = xyes)
-AM_CONDITIONAL(BUILD_PSDOC, test "x$BUILD_PSDOC" = xyes)
-AM_CONDITIONAL(BUILD_HTMLDOC, test "x$BUILD_HTMLDOC" = xyes)
 XORG_CHECK_DOCBOOK
 
 AC_CONFIG_FILES([Makefile
-- 
1.6.0.4



More information about the xorg-devel mailing list