Add --disable-docs flag

configure.in

@@ -289,6 +289,22 @@ AC_SUBST(CONFDIR)
 ORTH_FILES=`cd fc-lang && echo *.orth`
 AC_SUBST(ORTH_FILES)
 
+#
+# Let people not build/install docs if they don't have docbook
+#
+
+AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
+
+AC_ARG_ENABLE(docs,           [  --disable-docs               Don't build and install documentation],,enable_docs=yes)
+
+if test "x$enable_docs" = xyes; then
+  if test "x$HASDOCBOOK" != xyes; then
+    enable_docs=no
+  fi
+fi
+
+AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
+
 #
 # Figure out where to install documentation
 #

doc/Makefile.am

@@ -22,14 +22,25 @@ SUFFIXES=.sgml .txt .html
 
 EXTRA_DIST = $(TXT) $(HTML) $(SGML)
 	
-all-local: $(TXT) $(HTML)
+if ENABLE_DOCS
-
+DOCS=$(TXT) $(HTML)
+all-local: all-docs
+clean-local: clean-docs
+install-data-local: install-docs
+else
+all-local:
 clean-local:
-	rm -f $(TXT) $(HTML)
-
 install-data-local:
+endif
+
+all-docs: $(DOCS)
+
+clean-docs:
+	rm -f $(DOCS)
+
+install-docs:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	for i in $(TXT) $(HTML); do \
+	for i in $(DOCS); do \
 	  echo '-- Installing'$$i ; \
 	  $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR)/$$i; \
 	done

src/Makefile.am

@@ -25,10 +25,6 @@ libfontconfig_la_SOURCES = \
 	fcstr.c \
 	fcxml.c
 	
-man_MANS = fontconfig.3
-
-EXTRA_DIST = $(man_MANS)
-
 lib_LTLIBRARIES = libfontconfig.la
 
 libfontconfig_la_LDFLAGS =			\