X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=etc%2FMakefile.am;h=fa62b18daaecd62acb22796729c8678d060519b0;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=977277b627361a7f7d373c351bf649913541904b;hpb=275c61aaf848a6c167a9a593fae7ca8e55f4cb73;p=metaproxy-moved-to-github.git

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 977277b..fa62b18 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.10 2007-02-01 07:49:20 marc Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
@@ -12,6 +11,7 @@ xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config-shared1.xml \
     $(srcdir)/config-simple-multi.xml \
     $(srcdir)/config-sru-to-z3950.xml \
+    $(srcdir)/config-sru-holdings.xml \
     $(srcdir)/config-zurg.xml \
     $(srcdir)/config0.xml \
     $(srcdir)/config1.xml \
@@ -35,13 +35,12 @@ EXTRA_DIST = $(etcdata_DATA)
 check_rng: 
 	xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
 
+## Only run XSD checks for a "new" Libxml2
 .PHONY: check_xsd
 check_xsd: 
-	xmllint --noout --xinclude --schema $(xsd) $(xmlconfig)
+	if test `xmllint --version 2>&1 |head -1|awk '{print $$5}'` -gt 20622; then xmllint --noout --xinclude --schema $(xsd) $(xmlconfig); fi
 
-
-check-local:
-	$(MAKE) check_xsd
-	$(MAKE) check_rng
+#check-local: check_rng check_xsd
+check-local: check_rng