From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 24 Dec 2009 16:05:12 +0000 (+0100)
Subject: Fix fault XML in documentation.
X-Git-Tag: fc11-i386-build63^0
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1085f5128713881e135ea83fbdf411b99e8f32b6;p=pspp-builds.git

Fix fault XML in documentation.

Avoid broken XML generated by Texinfo. Add a make rule
to check for this in the future.
---

diff --git a/configure.ac b/configure.ac
index 1ef538bc..dad55e2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ required_gtk_version=2.12
 if test x"$with_gui" != x"no" ; then 
   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,,
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])])
+  AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
+  AC_SUBST(XMLLINT)
 fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
diff --git a/doc/automake.mk b/doc/automake.mk
index b24eb51e..0963e1fd 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -58,6 +58,7 @@ doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS)
 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
 		$(top_srcdir)/doc/pspp.texinfo -o - \
 		| $(SED) 's/Time-&-Date/Time-\&amp;-Date/g' > $@
+	$(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false )
 
 docbookdir = $(docdir)
 docbook_DATA = doc/pspp.xml
diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo
index 562b328d..830e82e4 100644
--- a/doc/pspp.texinfo
+++ b/doc/pspp.texinfo
@@ -65,9 +65,8 @@ modify this GNU manual.''
 @insertcopying
 @end titlepage
 
-@chapheading Acknowledgements
-The authors wish to thank
-Network Theory Ltd 
+@c @chapheading Acknowledgements
+The authors wish to thank Network Theory Ltd 
 @url{http://www.network-theory.co.uk}
 for their financial support 
 in the production of this manual.