From 51ad64cc0791f797c936d8d7b1cef0dec64c0ce3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 18 Sep 2009 11:45:56 +0000
Subject: [PATCH] * Use xmllint (>= 2.7.4) for RelaxNG validation instead of
 Jing.

---
 configure.ac           | 1 -
 doc/manual/Makefile.am | 8 ++------
 release.nix            | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0ad3a2a9c..fcb5efaf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,7 +140,6 @@ NEED_PROG(bash, bash)
 NEED_PROG(patch, patch)
 AC_PATH_PROG(xmllint, xmllint, false)
 AC_PATH_PROG(xsltproc, xsltproc, false)
-AC_PATH_PROG(jing, jing, false) # needed because xmllint --relaxng seems broken
 AC_PATH_PROG(w3m, w3m, false)
 AC_PATH_PROG(flex, flex, false)
 AC_PATH_PROG(bison, bison, false)
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 8dbc196f7..55450c9a5 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -34,13 +34,9 @@ MANUAL_SRCS = manual.xml introduction.xml installation.xml \
  conf-file.xml release-notes.xml \
  style.css images
 
+# Note: RelaxNG validation requires xmllint >= 2.7.4.
 manual.is-valid: $(MANUAL_SRCS) version.txt
-#	$(XMLLINT) --xinclude $< | $(XMLLINT) --noout --nonet --relaxng $(docbookrng)/docbook.rng -
-	if test "$(jing)" != "false"; then \
-		$(XMLLINT) --xinclude $< | $(jing) $(docbookrng)/docbook.rng /dev/fd/0; \
-	else \
-		echo "Not validating."; \
-	fi
+	$(XMLLINT) --noout --nonet --xinclude --noxincludenode --relaxng $(docbookrng)/docbook.rng $<
 	touch $@
 
 version.txt:
diff --git a/release.nix b/release.nix
index 47e68dccf..ada0d3421 100644
--- a/release.nix
+++ b/release.nix
@@ -19,7 +19,7 @@ let
         inherit officialRelease;
 
         buildInputs =
-          [ curl bison flex2533 perl libxml2 libxslt w3m bzip2 jing_tools
+          [ curl bison flex2533 perl libxml2New libxslt w3m bzip2
             tetex dblatex nukeReferences
           ];