[Commit] fontconfig Makefile.am,1.10,1.11 configure.in,1.39,1.40

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/fontconfig
In directory home.keithp.com:/tmp/cvs-serv7737

Modified Files:
	Makefile.am configure.in 
Log Message:
Bug 75: dont build docs unless docbook is available.  Dont install docs unless they are pre-built or buildable

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/fontconfig/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	9 Jun 2003 18:49:18 -0000	1.10
+++ Makefile.am	17 Jun 2003 18:28:19 -0000	1.11
@@ -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 \

Index: configure.in
===================================================================
RCS file: /local/src/CVS/fontconfig/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.in	13 Jun 2003 22:43:28 -0000	1.39
+++ configure.in	17 Jun 2003 18:28:19 -0000	1.40
@@ -335,15 +335,31 @@
 
 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
-  if test "x$HASDOCBOOK" != xyes; then
-    enable_docs=no
-  fi
+default_docs="yes"
+#
+# Check if docs exist or can be created
+#
+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