Have most etc files part of dist

diff --git a/Makefile.am b/Makefile.am
index f9ed252..56cc247 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## This file is part of Metaproxy
 ## Copyright (C) 2005-2006, Index Data ApS
-## $Id: Makefile.am,v 1.12 2006-04-27 08:51:31 adam Exp $
+## $Id: Makefile.am,v 1.13 2006-04-27 17:01:00 adam Exp $
 
-SUBDIRS = src doc
+SUBDIRS = src doc etc
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index aad810c..ec5ba0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,7 @@ AC_CONFIG_FILES([
         doc/common/html.xsl
         doc/common/print.dsl
         doc/common/tkl.xsl
+       etc/Makefile
 ])
 
 AC_OUTPUT

diff --git a/etc/.cvsignore b/etc/.cvsignore
index a381a75..6ce84b9 100644 (file)
--- a/etc/.cvsignore
+++ b/etc/.cvsignore
@@ -1 +1,3 @@
 tmp*.xml
+Makefile
+Makefile.in

diff --git a/etc/Makefile.am b/etc/Makefile.am
new file mode 100644 (file)
index 0000000..f62c6e7
--- /dev/null
+++ b/etc/Makefile.am
@@ -0,0 +1,24 @@
+# $Id: Makefile.am,v 1.1 2006-04-27 17:01:00 adam Exp $
+
+# This doesn't actually build anything, it just tests whether the
+# configuration files here correspond with the schema.
+
+etcdatadir = $(pkgdatadir)/etc
+
+config = config0.xml config1.xml config2.xml \
+       config3.xml config4.xml config5.xml \
+       config-simple-multi.xml
+
+misc = example.simple-auth example.target-auth pqf2pqf.xsl
+
+etcdata_DATA = $(config) $(misc)
+
+EXTRA_DIST = $(etcdata_DATA)
+
+test: test-config0 test-config1 test-config2 \
+      test-config3 test-config4 test-config5 \
+      test-config-simple-multi
+
+test-%: %.xml config.xsd 
+       xmllint --noout --schema config.xsd $<
+