From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 29 Oct 2015 19:11:36 +0000 (+0100)
Subject: Fixed problem building documentation in absence of xmllint
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c99f9d21cb56f29e576d9eb91b2cc9ec8fed0f0;p=pspp

Fixed problem building documentation in absence of xmllint

This change fixes two problems:

1. XMLLINT was only checked in configure if --without-cairo was not given.   However,
the documentation (may) require it.

2. The file doc/help-pages-list needed to be shipped.  Otherwise the docs need to be rebuilt which
is not desired for users
---

diff --git a/configure.ac b/configure.ac
index a819d44b18..bf7e6753f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,12 @@ if test "$with_cairo" != no; then
      AC_DEFINE([HAVE_CAIRO], 1, 
        [Define to 1 if Cairo and Pango are available.])],
     [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
-  AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
-  AC_SUBST(XMLLINT)
 fi
 
+dnl Xmllint may be required to build the documentation
+AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
+AC_SUBST(XMLLINT)
+
 # Support for GUI.
 AC_ARG_WITH([gui], 
   [AS_HELP_STRING([--without-gui], 
diff --git a/doc/automake.mk b/doc/automake.mk
index 7ebf3481fe..4e1b3ff349 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -47,7 +47,7 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl
+EXTRA_DIST += doc/get-commands.pl doc/help-pages-list
 
 $(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
 	@$(MKDIR_P)  doc