Bug 75: dont build docs unless docbook is available. Dont install docs

unless they are pre-built or buildable

Makefile.am

@@ -21,7 +21,8 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS=fontconfig fc-lang fc-glyphname src fc-cache fc-list fc-match doc test
+DOCSRC=@DOCSRC@
+SUBDIRS=fontconfig fc-lang fc-glyphname src fc-cache fc-list fc-match $(DOCSRC) test
 
 EXTRA_DIST = \
         fontconfig.pc.in \

configure.in

@@ -335,16 +335,32 @@ AC_SUBST(ORTH_FILES)
 
 AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no)
 
-AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=yes)
+AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes)
 
-if test "x$enable_docs" = xyes; then
+default_docs="yes"
-  if test "x$HASDOCBOOK" != xyes; then
+#
-    enable_docs=no
+# Check if docs exist or can be created
-  fi
+#
+if test x$HASDOCBOOK = xno; then
+	if test -f doc/fonts-conf.5; then
+		:
+	else
+		default_docs="no"
+	fi
 fi
 
+AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=$default_docs)
+
 AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
 
+if test "x$enable_docs" = xyes; then
+	DOCSRC="doc"
+else
+	DOCSRC=""
+fi
+
+AC_SUBST(DOCSRC)
+
 #
 # Figure out where to install documentation
 #

doc/Makefile.am

@@ -93,7 +93,7 @@ EXTRA_DIST = $(LOCAL_DOCS) $(SGML) $(DOC_FUNCS_FNCS) $(FNCS_TMPL)
 	
 SUFFIXES=.fncs .sgml .txt .html
 
-if ENABLE_DOCS
+if USEDOCBOOK
 
 .fncs.sgml:
 	$(RM) $@