[PATCH libX11 3/3] docs: Disable fop documentation by default

[Dan Nicholson]

fop is used to generate the pdf and ps formats of the documentation.
This can significantly slow down the build, especially when creating all
the compose key charts. Since all the docs really only ever need to be
created for the tarball, set the default to 'no', but ensure that
they're built during distcheck.

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
---
 Makefile.am  |    1 +
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 49c32bf..bda2377 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = x11.pc x11-xcb.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
+DISTCHECK_CONFIGURE_FLAGS = --with-fop
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index b3878f2..5b79b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ XORG_MACROS_VERSION(1.10)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_SPECS
 XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
+XORG_WITH_FOP([no])
 XORG_CHECK_SGML_DOCTOOLS(1.5)
 XORG_PROG_RAWCPP
 
-- 
1.7.2.3