[Fontconfig] Minor build fixes

[Carl Worth]

I just tried compiling fontconfig from CVS on a very bare-bones
system and ran into a few build problems. The attached patch fixes a
couple of the problems I hit:

	* If some part of autogen.sh fails it still prints "Now type
          'make'". Fixed by adding "set -e".

	* Some Makefiles want to build man files but don't know how if
          docbook is not available. Fixed by moving man_MANS targets
          inside the "if USEDOCBOOK" test.

Then there was one problem I hit that I never figured out how to
fix. I installed expat with prefix=/some/dir and tried to configure
fontconfig --with-expat, but it didn't work:

	$ ./configure --with-expat=/some/dir
	...
	checking expat.h usability... no
	checking expat.h presence... no
	checking for expat.h... no
	checking xmlparse.h usability... no
	checking xmlparse.h presence... no
	checking for xmlparse.h... no
	configure: error: Cannot find usable expat library. This could mean that your version is too old.

I got tripped up here for quite some time since the last error message
was concerning xmlparse.h which I couldn't find in any recent version
of expat. When I finally realized I didn't need xmlparse.h, I got
things working by using:

	./configure --with-expat-includes=/some/dir/include --with-expat-lib=/some/dir/lib

So, is --with-expat broken or am I just using it wrong?

-Carl

PS. One last rant, (a bug in autofoo itself).

<rant>

I had tremendous pain trying the following command:

	./configure --with-expat-includes=/some/dir/include --with-expat-libs=/some/dir/lib

which found expat.h, but couldn't find the XML_SetDoctypeDeclHandler
function.

Can you spot the bug in this command? Can you keep track of such
inconsistent use of the letter 's'?

It would be *really* nice if we could get ./configure to abort on
unknown command-line options. Anyone know how to do that?

</rant>

Now that I've written that and have it archived, I'll go track down a
more constructive place to report the problem.

-------------- next part --------------
Index: autogen.sh
===================================================================
RCS file: /cvs/fontconfig/fontconfig/autogen.sh,v
retrieving revision 1.3
diff -u -r1.3 autogen.sh
--- autogen.sh	22 Apr 2003 16:53:18 -0000	1.3
+++ autogen.sh	11 Dec 2003 15:47:40 -0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
+set -e
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
Index: fc-cache/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-cache/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- fc-cache/Makefile.am	27 Oct 2003 10:44:13 -0000	1.7
+++ fc-cache/Makefile.am	11 Dec 2003 15:47:41 -0000
@@ -29,8 +29,6 @@
 
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
-man_MANS=fc-cache.1
-
 bin_PROGRAMS=fc-cache
 
 EXTRA_DIST=$(SGML)
@@ -38,7 +36,9 @@
 fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
-                                                                                
+
+man_MANS=fc-cache.1
+
 ${man_MANS}: ${SGML}										
 	$(RM) $@
 	$(DOC2MAN) ${SGML}
Index: fc-list/Makefile.am
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-list/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- fc-list/Makefile.am	27 Oct 2003 10:44:13 -0000	1.7
+++ fc-list/Makefile.am	11 Dec 2003 15:47:41 -0000
@@ -29,8 +29,6 @@
 
 bin_PROGRAMS=fc-list
 
-man_MANS=fc-list.1
-
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 EXTRA_DIST=$(SGML)
@@ -40,6 +38,8 @@
 
 if USEDOCBOOK
 
+man_MANS=fc-list.1
+
 ${man_MANS}: ${SGML}
 	$(RM) $@
 	$(DOC2MAN) ${SGML}