summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-09-13 08:51:34 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-09-13 19:23:37 -0400
commit49e493163a6fafec93e37c221390d10518b04807 (patch)
treed580c9e18d48b6c0f407a153c49de6286e25975b
parent0fd6a2b459a9ff2ecc9514f6d5dac466c3f450cd (diff)
config: use XORG_CHECK_DOCBOOK macro as is.
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. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--configure.ac17
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