X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=etc%2FMakefile.am;h=29f1dd905674ec6977c265d97e4b3be2df73cb27;hb=9b8466644a970341459fd3fe3b270defd337ed48;hp=ea834d2d6653b8b06fc735e231d2684e77e0a20a;hpb=97ff1dba50219020e4e75b0fd2a2adf57ffb4579;p=metaproxy-moved-to-github.git

diff --git a/etc/Makefile.am b/etc/Makefile.am
index ea834d2..29f1dd9 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2006-10-11 13:21:51 marc Exp $
+# $Id: Makefile.am,v 1.12 2007-02-17 13:03:29 adam Exp $
 
 # This doesn't actually build anything, it just tests whether the
 # configuration files here correspond with the schema.
@@ -7,6 +7,7 @@ etcdatadir = $(pkgdatadir)/etc
 
 xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config-local.xml \
+    $(srcdir)/config-load-balance.xml \
     $(srcdir)/config-record-transform.xml \
     $(srcdir)/config-shared1.xml \
     $(srcdir)/config-simple-multi.xml \
@@ -17,9 +18,10 @@ xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config2.xml \
     $(srcdir)/config3.xml \
     $(srcdir)/config4.xml \
-    $(srcdir)/config5.xml
+    $(srcdir)/config5.xml \
+    $(srcdir)/retrieval-info.xml
 
-config = example.simple-auth example.target-auth pqf2pqf.xsl
+config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml
 
 
 rng = $(srcdir)/../xml/schema/metaproxy.rng
@@ -31,15 +33,13 @@ EXTRA_DIST = $(etcdata_DATA)
 
 .PHONY: check_rng
 check_rng: 
-	xmllint --noout --relaxng $(rng) $(xmlconfig)
+	xmllint --noout --xinclude --relaxng $(rng) $(xmlconfig)
 
+## Only run XSD checks for a "new" Libxml2
 .PHONY: check_xsd
 check_xsd: 
-	xmllint --noout --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