Initial import

4 files changed, 1217 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..c8f8beaf89e2
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,23 @@
+pkgbase = mingw-w64-libxml2
+	pkgdesc = XML parsing library, version 2 (mingw-w64)
+	pkgver = 2.9.2
+	pkgrel = 1
+	url = http://www.xmlsoft.org/
+	arch = any
+	license = LGPL
+	makedepends = mingw-w64-configure
+	depends = mingw-w64-crt
+	depends = mingw-w64-gettext
+	depends = mingw-w64-zlib
+	options = !buildflags
+	options = !strip
+	options = staticlibs
+	source = http://xmlsoft.org/sources/libxml2-2.9.2.tar.gz
+	source = mingw32-libxml2-static-build-compile-fix.patch
+	source = libxml2-no-test.patch
+	md5sums = SKIP
+	md5sums = 0df377025082cd93cccbca547f048011
+	md5sums = ddd73e88dda6ae318267507409445b7d
+
+pkgname = mingw-w64-libxml2
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..2d678c29b99d
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,70 @@
+# Contributor: Filip Brcic <brcha@gna.org>
+
+pkgname=mingw-w64-libxml2
+pkgver=2.9.2
+pkgrel=1
+arch=('any')
+pkgdesc="XML parsing library, version 2 (mingw-w64)"
+depends=('mingw-w64-crt' 'mingw-w64-gettext' 'mingw-w64-zlib')
+makedepends=('mingw-w64-configure')
+options=('!buildflags' '!strip' 'staticlibs')
+license=('LGPL')
+url="http://www.xmlsoft.org/"
+source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz"
+        "mingw32-libxml2-static-build-compile-fix.patch"
+        "libxml2-no-test.patch")
+md5sums=('SKIP'
+         '0df377025082cd93cccbca547f048011'
+         'ddd73e88dda6ae318267507409445b7d')
+
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare () {
+  cd "${srcdir}/libxml2-${pkgver}"
+  patch -Np0 -i "${srcdir}"/mingw32-libxml2-static-build-compile-fix.patch
+  patch -Np1 -i "${srcdir}"/libxml2-no-test.patch
+  sed -i "s| doc example | |g" Makefile.am
+  sed -i "s|LIBXML_STATIC|_WIN32|g" include/libxml/xmlexports.h
+  autoreconf -vfi
+}
+
+build()
+{
+  cd "${srcdir}/libxml2-${pkgver}"
+
+  # Static build
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-configure \
+      --without-python \
+      --enable-ipv6 \
+      --with-modules LIBS="-lz"
+    make
+
+    # deps symbols are not included:
+    ${_arch}-ar x /usr/${_arch}/lib/libiconv.a
+    ${_arch}-ar x /usr/${_arch}/lib/libz.a
+    ${_arch}-ar x /usr/${_arch}/lib/libws2_32.a
+    ${_arch}-ar cru .libs/libxml2.a *.o 
+    ${_arch}-ranlib .libs/libxml2.a
+
+    popd
+  done
+}
+
+package()
+{
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/libxml2-${pkgver}/build-${_arch}"
+    make install DESTDIR="${pkgdir}"
+
+    ${_arch}-strip --strip-all "${pkgdir}"/usr/${_arch}/bin/*.exe
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip --strip-debug "${pkgdir}"/usr/${_arch}/lib/*.a
+
+    # Remove documentation
+    rm -r "${pkgdir}"/usr/${_arch}/share
+    
+  done
+}
+
diff --git a/libxml2-no-test.patch b/libxml2-no-test.patch
new file mode 100644
index 000000000000..386ae4d78698
--- /dev/null
+++ b/libxml2-no-test.patch
@@ -0,0 +1,1113 @@
+diff -ur libxml2-2.9.1.orig/Makefile.am libxml2-2.9.1/Makefile.am
+--- libxml2-2.9.1.orig/Makefile.am	2013-11-30 16:46:20.273724298 +0100
++++ libxml2-2.9.1/Makefile.am	2013-11-30 16:49:40.131795741 +0100
+@@ -10,11 +10,6 @@
+ 
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
+ 
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+-                testThreads testC14N testAutomata testRegexp \
+-                testReader testapi testModule runtest runsuite testchar \
+-		testdict runxmlconf testrecurse testlimits
+-
+ bin_PROGRAMS = xmllint xmlcatalog
+ 
+ bin_SCRIPTS=xml2-config
+@@ -66,1097 +61,16 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = libxml.m4
+ 
+-runtest_SOURCES=runtest.c
+-runtest_LDFLAGS = 
+-runtest_DEPENDENCIES = $(DEPS)
+-runtest_LDADD= $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
+-
+-testrecurse_SOURCES=testrecurse.c
+-testrecurse_LDFLAGS = 
+-testrecurse_DEPENDENCIES = $(DEPS)
+-testrecurse_LDADD= $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
+-
+-testlimits_SOURCES=testlimits.c
+-testlimits_LDFLAGS = 
+-testlimits_DEPENDENCIES = $(DEPS)
+-testlimits_LDADD= $(BASE_THREAD_LIBS) $(RDL_LIBS) $(LDADDS)
+-
+-testchar_SOURCES=testchar.c
+-testchar_LDFLAGS = 
+-testchar_DEPENDENCIES = $(DEPS)
+-testchar_LDADD= $(RDL_LIBS) $(LDADDS)
+-
+-testdict_SOURCES=testdict.c
+-testdict_LDFLAGS = 
+-testdict_DEPENDENCIES = $(DEPS)
+-testdict_LDADD= $(RDL_LIBS) $(LDADDS)
+-
+-runsuite_SOURCES=runsuite.c
+-runsuite_LDFLAGS = 
+-runsuite_DEPENDENCIES = $(DEPS)
+-runsuite_LDADD= $(RDL_LIBS) $(LDADDS)
+-
+ xmllint_SOURCES=xmllint.c
+ xmllint_LDFLAGS = 
+ xmllint_DEPENDENCIES = $(DEPS)
+ xmllint_LDADD=  $(RDL_LIBS) $(LDADDS)
+ 
+-testSAX_SOURCES=testSAX.c
+-testSAX_LDFLAGS = 
+-testSAX_DEPENDENCIES = $(DEPS)
+-testSAX_LDADD= $(LDADDS)
+-
+-testHTML_SOURCES=testHTML.c
+-testHTML_LDFLAGS = 
+-testHTML_DEPENDENCIES = $(DEPS)
+-testHTML_LDADD= $(LDADDS)
+-
+ xmlcatalog_SOURCES=xmlcatalog.c
+ xmlcatalog_LDFLAGS = 
+ xmlcatalog_DEPENDENCIES = $(DEPS)
+ xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
+ 
+-testXPath_SOURCES=testXPath.c
+-testXPath_LDFLAGS = 
+-testXPath_DEPENDENCIES = $(DEPS)
+-testXPath_LDADD= $(LDADDS)
+-
+-testC14N_SOURCES=testC14N.c
+-testC14N_LDFLAGS = 
+-testC14N_DEPENDENCIES = $(DEPS)
+-testC14N_LDADD= $(LDADDS)
+-
+-if THREADS_W32
+-testThreads_SOURCES = testThreadsWin32.c
+-else
+-testThreads_SOURCES = testThreads.c
+-endif
+-testThreads_LDFLAGS = 
+-testThreads_DEPENDENCIES = $(DEPS)
+-testThreads_LDADD= $(BASE_THREAD_LIBS) $(LDADDS)
+-
+-testURI_SOURCES=testURI.c
+-testURI_LDFLAGS = 
+-testURI_DEPENDENCIES = $(DEPS)
+-testURI_LDADD= $(LDADDS)
+-
+-testRegexp_SOURCES=testRegexp.c
+-testRegexp_LDFLAGS = 
+-testRegexp_DEPENDENCIES = $(DEPS)
+-testRegexp_LDADD= $(LDADDS)
+-
+-testAutomata_SOURCES=testAutomata.c
+-testAutomata_LDFLAGS = 
+-testAutomata_DEPENDENCIES = $(DEPS)
+-testAutomata_LDADD= $(LDADDS)
+-
+-testSchemas_SOURCES=testSchemas.c
+-testSchemas_LDFLAGS = 
+-testSchemas_DEPENDENCIES = $(DEPS)
+-testSchemas_LDADD= $(LDADDS)
+-
+-testRelax_SOURCES=testRelax.c
+-testRelax_LDFLAGS = 
+-testRelax_DEPENDENCIES = $(DEPS)
+-testRelax_LDADD= $(LDADDS)
+-
+-testReader_SOURCES=testReader.c
+-testReader_LDFLAGS = 
+-testReader_DEPENDENCIES = $(DEPS)
+-testReader_LDADD= $(LDADDS)
+-
+-testModule_SOURCES=testModule.c
+-testModule_LDFLAGS = 
+-testModule_DEPENDENCIES = $(DEPS)
+-testModule_LDADD= $(LDADDS)
+-
+-noinst_LTLIBRARIES = testdso.la
+-testdso_la_SOURCES = testdso.c
+-testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
+-
+-# that one forces the rebuild when "make rebuild" is run on doc/
+-rebuild_testapi:
+-	-@(if [ "$(PYTHON)" != "" ] ; then \
+-	    $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
+-
+-# that one is just to make sure it is rebuilt if missing
+-# but adding the dependances generate mess
+-testapi.c: $(srcdir)/gentest.py
+-	-@(if [ "$(PYTHON)" != "" ] ; then \
+-	    $(PYTHON) $(srcdir)/gentest.py $(srcdir) ; fi )
+-
+-BUILT_SOURCES = testapi.c
+-
+-testapi_SOURCES=testapi.c
+-testapi_LDFLAGS = 
+-testapi_DEPENDENCIES = $(DEPS)
+-testapi_LDADD= $(LDADDS)
+-
+-runxmlconf_SOURCES=runxmlconf.c
+-runxmlconf_LDFLAGS = 
+-runxmlconf_DEPENDENCIES = $(DEPS)
+-runxmlconf_LDADD= $(LDADDS)
+-
+-#testOOM_SOURCES=testOOM.c testOOMlib.h testOOMlib.c
+-#testOOM_LDFLAGS = 
+-#testOOM_DEPENDENCIES = $(DEPS)
+-#testOOM_LDADD= $(LDADDS)
+-
+-runtests:
+-	[ -d test   ] || $(LN_S) $(srcdir)/test   .
+-	[ -d result ] || $(LN_S) $(srcdir)/result .
+-	$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
+-	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
+-	    $(MAKE) tests ; fi)
+-
+-check: all runtests
+-
+-check-valgrind valgrind: all
+-	@echo '## Running the regression tests under Valgrind'
+-	@echo '## Go get a cup of coffee it is gonna take a while ...'
+-	$(MAKE) CHECKER='valgrind -q' runtests
+-
+-testall : tests SVGtests SAXtests
+-
+-tests: XMLtests XMLenttests NStests IDtests Errtests APItests $(READER_TEST) $(TEST_SAX) $(TEST_PUSH) $(TEST_HTML) $(TEST_PHTML) $(TEST_VALID) URItests $(TEST_PATTERN) $(TEST_XPATH) $(TEST_XPTR) $(TEST_XINCLUDE) $(TEST_C14N) $(TEST_DEBUG) $(TEST_CATALOG) $(TEST_REGEXPS) $(TEST_SCHEMAS) $(TEST_SCHEMATRON) $(TEST_THREADS) Timingtests $(TEST_VTIME) $(PYTHON_TESTS) $(TEST_MODULES)
+-	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
+-	    $(MAKE) tests ; fi)
+-	@(cd doc/examples ; $(MAKE) tests)
+-
+-APItests: testapi$(EXEEXT)
+-	@echo "## Running the API regression tests this may take a little while"
+-	-@($(CHECKER) $(top_builddir)/testapi -q)
+-
+-HTMLtests : testHTML$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## HTML regression tests"
+-	-@(for i in $(srcdir)/test/HTML/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testHTML $$i > result.$$name 2> error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/HTML/$$name result.$$name ; \
+-	      diff -b $(srcdir)/result/HTML/$$name.err error.$$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML result.$$name > result2.$$name 2>error.$$name ; \
+-	      diff result.$$name result2.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result2.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-
+-HTMLPushtests : testHTML$(EXEEXT)
+-	@echo "## Push HTML regression tests"
+-	-@(for i in $(srcdir)/test/HTML/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML --push $$i > $(srcdir)/result/HTML/$$name 2>$(srcdir)/result/HTML/$$name.err ; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testHTML --push $$i > result.$$name 2> error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/HTML/$$name result.$$name ; \
+-	      cut -b 1-15 $(srcdir)/result/HTML/$$name.err > errorcut.$$name; \
+-	      cut -b 1-15 error.$$name > errorcut2.$$name; \
+-	      diff -b errorcut.$$name errorcut2.$$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML --push result.$$name > result2.$$name 2>error.$$name ; \
+-	      diff result.$$name result2.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result2.$$name error.$$name errorcut.$$name errorcut2.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## HTML SAX regression tests"
+-	-@(for i in $(srcdir)/test/HTML/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/HTML/$$name.sax ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testHTML --sax $$i > result.$$name.sax ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/HTML/$$name.sax result.$$name.sax` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name.sax ; \
+-	  fi ; fi ; done)
+-	@echo "## Push HTML SAX regression tests"
+-	-@(for i in $(srcdir)/test/HTML/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/HTML/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testHTML --push --sax $$i > $(srcdir)/result/HTML/$$name.sax ; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testHTML --push --sax $$i 2>&1 > result.$$name.sax ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/HTML/$$name.sax result.$$name.sax` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name.sax ; \
+-	  fi ; fi ; done)
+-
+-XMLtests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XML regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/$$name result.$$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff result.$$name result2.$$name` ;\
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result2.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## XML regression tests on memory"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --memory $$i > $(srcdir)/result/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --memory $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name result.$$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --memory result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"`; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      diff result.$$name result2.$$name ; \
+-	      rm result.$$name result2.$$name ; \
+-	  fi ; fi ; done)
+-
+-XMLPushtests: xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XML push regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --push $$i > $(srcdir)/result/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --push $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/$$name result.$$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --push result.$$name 2>&1 > result2.$$name | grep -v 'failed to load external entity' ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff result.$$name result2.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result2.$$name ; \
+-	  fi ; fi ; done)
+-
+-NStests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XML Namespaces regression tests"
+-	-@(for i in $(srcdir)/test/namespaces/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/namespaces/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint $$i \
+-	         2> $(srcdir)/result/namespaces/$$name.err \
+-		 > $(srcdir)/result/namespaces/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/namespaces/$$name result.$$name ; \
+-	      diff $(srcdir)/result/namespaces/$$name.err error.$$name`; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-
+-IDtests : xmllint$(EXEEXT) testXPath$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## xml:id regression tests"
+-	-@(for i in $(srcdir)/test/xmlid/id_*.xml ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/xmlid/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" \
+-	         2> $(srcdir)/result/xmlid/$$name.err \
+-		 > $(srcdir)/result/xmlid/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testXPath -i $$i "id('bar')" 2> error.$$name > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/xmlid/$$name result.$$name ; \
+-	      diff $(srcdir)/result/xmlid/$$name.err error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-
+-Errtests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Error cases regression tests"
+-	-@(for i in $(srcdir)/test/errors/*.xml ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/errors/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint $$i \
+-	         2> $(srcdir)/result/errors/$$name.err \
+-		 > $(srcdir)/result/errors/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/errors/$$name result.$$name ; \
+-	      diff $(srcdir)/result/errors/$$name.err error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## Error cases stream regression tests"
+-	-@(for i in $(srcdir)/test/errors/*.xml ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/errors/$$name.str ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --stream $$i \
+-	         2> $(srcdir)/result/errors/$$name.str \
+-		 > /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --stream $$i 2> error.$$name > /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/errors/$$name.str error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm error.$$name ; \
+-	  fi ; fi ; done)
+-
+-Docbtests : xmllint$(EXEEXT)
+-
+-XMLenttests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XML entity subst regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/noent/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --noent $$i > $(srcdir)/result/noent/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --noent $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff $(srcdir)/result/noent/$$name result.$$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --noent result.$$name 2>&1 > result2.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	      diff result.$$name result2.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result2.$$name ; \
+-	  fi ; fi ; done)
+-
+-URItests : testURI$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## URI module regression tests"
+-	-@(for i in $(srcdir)/test/URI/*.data ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/URI/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testURI -base 'http://foo.com/path/to/index.html?orig#help' < $$i > $(srcdir)/result/URI/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testURI -base 'http://foo.com/path/to/index.html?orig#help' < $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/URI/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	-@(for i in $(srcdir)/test/URI/*.uri ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/URI/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testURI < $$i > $(srcdir)/result/URI/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testURI < $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/URI/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-
+-XPathtests : testXPath$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XPath regression tests"
+-	-@(if [ "`$(top_builddir)/testXPath | grep 'support not compiled in'`" != "" ] ; \
+-	  then echo Skipping debug not compiled in ; exit 0 ; fi ; \
+-	  for i in $(srcdir)/test/XPath/expr/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/XPath/expr/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testXPath -f --expr $$i > $(srcdir)/result/XPath/expr/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XPath/expr/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done ; \
+-	  for i in $(srcdir)/test/XPath/docs/* ; do \
+-	  if [ ! -d $$i ] ; then \
+-	  doc=`basename $$i`; \
+-	  for j in $(srcdir)/test/XPath/tests/$$doc* ; do \
+-	  if [ ! -f $$j ] ; then continue ; fi ; \
+-	  name=`basename $$j`; \
+-	  if [ ! -d $$j ] ; then \
+-	  if [ ! -f $(srcdir)/result/XPath/tests/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j > $(srcdir)/result/XPath/tests/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XPath/tests/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done ; fi ; done)
+-
+-XPtrtests : testXPath$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XPointer regression tests"
+-	-@(if [ "`$(top_builddir)/testXPath | grep 'support not compiled in'`" != "" ] ; \
+-	  then echo Skipping debug not compiled in ; exit 0 ; fi ; \
+-	  for i in $(srcdir)/test/XPath/docs/* ; do \
+-	  if [ ! -d $$i ] ; then \
+-	  doc=`basename $$i`; \
+-	  for j in $(srcdir)/test/XPath/xptr/$$doc* ; do \
+-	  if [ ! -f $$j ] ; then continue ; fi ; \
+-	  name=`basename $$j`; \
+-	  if [ ! -d $$j ] ; then \
+-	  if [ ! -f $(srcdir)/result/XPath/xptr/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > $(srcdir)/result/XPath/xptr/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XPath/xptr/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done ; fi ; done)
+-
+-XIncludetests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## XInclude regression tests"
+-	-@(for i in $(srcdir)/test/XInclude/docs/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude $$i > result.$$name 2>error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XInclude/$$name result.$$name ; \
+-	      diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-	-@(for i in $(srcdir)/test/XInclude/docs/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/XInclude/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode $$i > $(srcdir)/result/XInclude/$$name 2> $(srcdir)/result/XInclude/$$name.err ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode $$i > result.$$name 2>error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XInclude/$$name result.$$name ; \
+-	      diff $(srcdir)/result/XInclude/$$name.err error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-	@(echo > .memdump)
+-	@echo "## XInclude xmlReader regression tests"
+-	-@(for i in $(srcdir)/test/XInclude/docs/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/XInclude/$$name.rdr ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \
+-	      diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-	-@(for i in $(srcdir)/test/XInclude/docs/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/XInclude/$$name.rdr ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nowarning --noxincludenode --stream --debug $$i > $(srcdir)/result/XInclude/$$name.rdr ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nowarning --xinclude --stream --debug $$i > result.$$name 2>error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/XInclude/$$name.err error.$$name ; \
+-	      diff $(srcdir)/result/XInclude/$$name.rdr result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-
+-Scripttests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Scripts regression tests"
+-	@echo "## Some of the base computations may be different if srcdir != ."
+-	-@(for i in $(srcdir)/test/scripts/*.script ; do \
+-	  name=`basename $$i .script`; \
+-	  xml=$(srcdir)/test/scripts/`basename $$i .script`.xml; \
+-	  if [ -f $$xml ] ; then \
+-	  if [ ! -f $(srcdir)/result/scripts/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --shell $$xml < $$i > $(srcdir)/result/scripts/$$name 2> $(srcdir)/result/scripts/$$name.err ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --shell $$xml < $$i > result.$$name 2> result.$$name.err ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/scripts/$$name result.$$name ; \
+-	      diff $(srcdir)/result/scripts/$$name.err result.$$name.err` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name result.$$name.err ; \
+-	  fi ; fi ; done)
+-
+-Catatests : xmlcatalog$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Catalog regression tests"
+-	-@(for i in $(srcdir)/test/catalogs/*.script ; do \
+-	  name=`basename $$i .script`; \
+-	  xml=$(srcdir)/test/catalogs/`basename $$i .script`.xml; \
+-	  if [ -f $$xml ] ; then \
+-	  if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > $(srcdir)/result/catalogs/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmlcatalog --shell $$xml < $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/catalogs/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	-@(for i in $(srcdir)/test/catalogs/*.script ; do \
+-	  name=`basename $$i .script`; \
+-	  sgml=$(srcdir)/test/catalogs/`basename $$i .script`.sgml; \
+-	  if [ -f $$sgml ] ; then \
+-	  if [ ! -f $(srcdir)/result/catalogs/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmlcatalog --shell $$sgml < $$i > $(srcdir)/result/catalogs/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmlcatalog --shell $$sgml < $$i > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/catalogs/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## Add and del operations on XML Catalogs"
+-	-@($(CHECKER) $(top_builddir)/xmlcatalog --create --noout $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid sysid $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid2 sysid2 $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --add public Pubid3 sysid3 $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	diff result/catalogs/mycatalog.full $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid3 $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	$(CHECKER) $(top_builddir)/xmlcatalog --noout --del sysid2 $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	diff result/catalogs/mycatalog.empty $(srcdir)/result/catalogs/mycatalog; \
+-	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	rm -f $(srcdir)/result/catalogs/mycatalog)
+-
+-SVGtests : xmllint$(EXEEXT)
+-	@echo "## SVG parsing regression tests"
+-	-@(for i in $(srcdir)/test/SVG/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/SVG/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint $$i > $(srcdir)/result/SVG/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      echo Testing $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint $$i > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/SVG/$$name result.$$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint result.$$name > result2.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff result.$$name result2.$$name ; \
+-	      rm result.$$name result2.$$name ; \
+-	  fi ; fi ; done)
+-
+-Threadtests : testThreads$(EXEEXT)
+-	@echo "## Threaded regression tests"
+-	-@($(CHECKER) $(top_builddir)/testThreads ; \
+-	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+-	   exit 0)
+-
+-Readertests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Reader regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nonet --debug --stream $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.rdr result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## Reader on memory regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --memory --nonet --debug --stream $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --memory --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.rdr result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@(echo > .memdump)
+-	@echo "## Walker regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.rdr ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --nonet --debug --walker $$i > $(srcdir)/result/$$name.rdr 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --nonet --debug --walker $$i > result.$$name 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.rdr result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## Reader entities substitution regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.rde ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > $(srcdir)/result/$$name.rde 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --noent --nonet --debug --stream $$i > result.$$name 2>/dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.rde result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-
+-SAXtests : testSAX$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## SAX1 callbacks regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.sax ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testSAX $$i > $(srcdir)/result/$$name.sax 2> /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testSAX $$i > result.$$name 2> /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.sax result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## SAX2 callbacks regression tests"
+-	-@(for i in $(srcdir)/test/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/$$name.sax2 ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testSAX --sax2 $$i > $(srcdir)/result/$$name.sax2 2> /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testSAX --sax2 $$i > result.$$name 2> /dev/null ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/$$name.sax2 result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-
+-Validtests : xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Valid documents regression tests"
+-	-@(for i in $(srcdir)/test/VCM/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --valid --noout --nowarning $$i ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"`;\
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	  fi ; done ; exit 0)
+-	@echo "## Validity checking regression tests"
+-	-@(for i in $(srcdir)/test/VC/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/VC/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --noout --valid $$i 2> $(srcdir)/result/VC/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --noout --valid $$i 2> result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/VC/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## General documents valid regression tests"
+-	-@(for i in $(srcdir)/test/valid/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/valid/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint --valid $$i > $(srcdir)/result/valid/$$name 2>$(srcdir)/result/valid/$$name.err ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint --valid $$i > result.$$name 2>error.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/valid/$$name result.$$name ; \
+-	      diff $(srcdir)/result/valid/$$name.err error.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name error.$$name ; \
+-	  fi ; fi ; done)
+-
+-Regexptests: testRegexp$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Regexp regression tests"
+-	-@(for i in $(srcdir)/test/regexp/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/regexp/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testRegexp -i $$i > $(srcdir)/result/regexp/$$name; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testRegexp -i $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/regexp/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-	@echo "## Formal expresssions regression tests"
+-	-@(for i in $(srcdir)/test/expr/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/expr/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testRegexp --expr -i $$i > $(srcdir)/result/expr/$$name; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testRegexp --expr -i $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/expr/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-
+-Automatatests: testAutomata$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Automata regression tests"
+-	-@(for i in $(srcdir)/test/automata/* ; do \
+-	  name=`basename $$i`; \
+-	  if [ ! -d $$i ] ; then \
+-	  if [ ! -f $(srcdir)/result/automata/$$name ] ; then \
+-	      echo New test file $$name ; \
+-	      $(CHECKER) $(top_builddir)/testAutomata $$i > $(srcdir)/result/automata/$$name; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/testAutomata $$i 2>&1 > result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/automata/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done)
+-
+-dba100000.xml: dbgenattr.pl
+-	@echo "## generating dba100000.xml"
+-	@($(PERL) $(top_srcdir)/dbgenattr.pl 100000 > dba100000.xml)
+-
+-Timingtests: xmllint$(EXEEXT) dba100000.xml
+-	@echo "## Timing tests to try to detect performance"
+-	@echo "## as well a memory usage breakage when streaming"
+-	@echo "## 1/ using the file interface"
+-	@echo "## 2/ using the memory interface"
+-	@echo "## 3/ repeated DOM parsing"
+-	@echo "## 4/ repeated DOM validation"
+-	-@($(top_builddir)/xmllint --stream --timing dba100000.xml; \
+-	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
+-	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
+-	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	   exit 0)
+-	-@($(top_builddir)/xmllint --stream --timing --memory dba100000.xml; \
+-	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
+-	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
+-	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	   exit 0)
+-	-@($(top_builddir)/xmllint --noout --timing --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \
+-	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
+-	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
+-	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	   exit 0)
+-
+-VTimingtests: xmllint$(EXEEXT)
+-	-@($(top_builddir)/xmllint --noout --timing --valid --repeat $(srcdir)/test/valid/REC-xml-19980210.xml; \
+-	   MEM=`cat .memdump | grep "MEMORY ALLOCATED" | awk '{ print $$7}'`;\
+-	   if [ "$$MEM" != "" ] ; then echo Using $$MEM bytes ; fi ; \
+-	   grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	   exit 0)
+-
+-C14Ntests : testC14N$(EXEEXT)
+-	@echo "## C14N and XPath regression tests"
+-	-@(for m in with-comments without-comments 1-1-without-comments exc-without-comments ; do \
+-	    for i in $(srcdir)/test/c14n/$$m/*.xml ; do  \
+-		if [ ! -d $$i ] ; then \
+-		    name=`basename $$i .xml`; \
+-		    cmdline="$(CHECKER) $(top_builddir)/testC14N --$$m $$i"; \
+-		    if [ -f $(srcdir)/test/c14n/$$m/$$name.xpath ] ; then \
+-			cmdline="$$cmdline $(srcdir)/test/c14n/$$m/$$name.xpath"; \
+-			if [ -f $(srcdir)/test/c14n/$$m/$$name.ns ] ; then \
+-			    cmdline="$$cmdline '`cat $(srcdir)/test/c14n/$$m/$$name.ns`'"; \
+-			fi; \
+-		    fi; \
+-		    $$cmdline > $(srcdir)/test/c14n/test.tmp; \
+-		    if [ $$? -eq 0 ]; then \
+-			diff  $(srcdir)/result/c14n/$$m/$$name $(srcdir)/test/c14n/test.tmp; \
+-			if [ $$? -ne 0 ]; then \
+-			    echo "Test $$m/$$name failed"; \
+-			    cat $(srcdir)/test/c14n/test.tmp; \
+-			fi; \
+-		    else \
+-			echo "C14N failed"; \
+-		    fi; \
+-		    grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-		fi; \
+-		rm -f $(srcdir)/test/c14n/test.tmp; \
+-	    done; \
+-	done)
+-
+-Schemastests: testSchemas$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Schemas regression tests"
+-	-@(for i in $(srcdir)/test/schemas/*_*.xsd ; do \
+-	  name=`basename $$i | sed 's+_.*++'`; \
+-	  sno=`basename $$i | sed 's+.*_\(.*\).xsd+\1+'`; \
+-	  for j in $(srcdir)/test/schemas/"$$name"_*.xml ; do \
+-	      if [ -f $$j ] ; then \
+-	      xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+-	      if [ ! -f $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" ]; \
+-	      then \
+-		  echo New test file "$$name"_"$$sno"_"$$xno" ; \
+-		  $(CHECKER) $(top_builddir)/testSchemas $$i $$j \
+-		    > $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" \
+-		    2> $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno".err; \
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      else \
+-	          log=`$(CHECKER) $(top_builddir)/testSchemas $$i $$j \
+-		    > res.$$name 2> err.$$name;\
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	          diff $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno" \
+-		       res.$$name;\
+-	          diff $(srcdir)/result/schemas/"$$name"_"$$sno"_"$$xno".err \
+-		       err.$$name;\
+-		  grep Unimplemented err.$$name`; \
+-	          if [ -n "$$log" ] ; then echo "$$name"_"$$sno"_"$$xno" result ; echo $$log ; fi ; \
+-	          rm res.$$name err.$$name ; \
+-	       fi ; fi ;\
+-	  done; done)
+-
+-Relaxtests: xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Relax-NG regression tests"
+-	-@(for i in $(srcdir)/test/relaxng/*.rng ; do \
+-	  name=`basename $$i | sed 's+\.rng++'`; \
+-	  if [ ! -f $(srcdir)/result/relaxng/"$$name"_valid ] ; then \
+-	      echo New schemas $$name ; \
+-	      $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $(srcdir)/test/relaxng/tutorA.rng $$i \
+-		      > $(srcdir)/result/relaxng/"$$name"_valid \
+-		      2> $(srcdir)/result/relaxng/"$$name"_err; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	  else \
+-	      log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $(srcdir)/test/relaxng/tutorA.rng $$i \
+-	      > res.$$name 2> err.$$name;\
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      diff $(srcdir)/result/relaxng/"$$name"_valid \
+-		   res.$$name;\
+-	      diff $(srcdir)/result/relaxng/"$$name"_err \
+-		   err.$$name | grep -v "error detected at";\
+-	      grep Unimplemented err.$$name`; \
+-	      if [ -n "$$log" ] ; then echo schemas $$name result ; echo $$log ; fi ; \
+-	      rm res.$$name err.$$name ; \
+-	  fi; \
+-	  for j in $(srcdir)/test/relaxng/"$$name"_*.xml ; do \
+-	      if [ -f $$j ] ; then \
+-	      xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+-	      if [ ! -f $(srcdir)/result/relaxng/"$$name"_"$$xno" ]; \
+-	      then \
+-		  echo New test file "$$name"_"$$xno" ; \
+-		  $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \
+-		    > $(srcdir)/result/relaxng/"$$name"_"$$xno" \
+-		    2> $(srcdir)/result/relaxng/"$$name"_"$$xno".err; \
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      else \
+-	          log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \
+-		    > res.$$name 2> err.$$name;\
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	          diff $(srcdir)/result/relaxng/"$$name"_"$$xno" \
+-		       res.$$name;\
+-	          diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \
+-		       err.$$name | grep -v "error detected at";\
+-		  grep Unimplemented err.$$name`; \
+-		  if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
+-	          rm res.$$name err.$$name ; \
+-	       fi ; fi ; \
+-	  done; done)
+-	@echo "## Relax-NG streaming regression tests"
+-	-@(for i in $(srcdir)/test/relaxng/*.rng ; do \
+-	  name=`basename $$i | sed 's+\.rng++'`; \
+-	  for j in $(srcdir)/test/relaxng/"$$name"_*.xml ; do \
+-	      if [ -f $$j ] ; then \
+-	      xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+-	      if [ ! -f $(srcdir)/result/relaxng/"$$name"_"$$xno" ]; \
+-	      then \
+-		  echo New test file "$$name"_"$$xno" ; \
+-		  $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --relaxng $$i $$j \
+-		    > $(srcdir)/result/relaxng/"$$name"_"$$xno" \
+-		    2> $(srcdir)/result/relaxng/"$$name"_"$$xno".err; \
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      else \
+-	          log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --noout --stream --relaxng $$i $$j \
+-		    > res.$$name 2> err.$$name;\
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	          diff $(srcdir)/result/relaxng/"$$name"_"$$xno" res.$$name;\
+-		  if [ "$$name" != "tutor10_1" -a "$$name" != "tutor10_2" -a "$$name" != "tutor3_2" -a "$$name" != "307377" -a "$$name" != "tutor8_2" ] ; then \
+-		      diff $(srcdir)/result/relaxng/"$$name"_"$$xno".err \
+-			   err.$$name | grep -v "error detected at";\
+-		  fi ; grep Unimplemented err.$$name`; \
+-	          if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
+-	          rm res.$$name err.$$name ; \
+-	       fi ; fi ; \
+-	  done; done)
+-
+-Schematrontests: xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Schematron regression tests"
+-	-@(for i in $(srcdir)/test/schematron/*.sct ; do \
+-	  name=`basename $$i | sed 's+\.sct++'`; \
+-	  for j in $(srcdir)/test/schematron/"$$name"_*.xml ; do \
+-	      if [ -f $$j ] ; then \
+-	      xno=`basename $$j | sed 's+.*_\(.*\).xml+\1+'`; \
+-	      if [ ! -f $(srcdir)/result/schematron/"$$name"_"$$xno" ]; \
+-	      then \
+-		  echo New test file "$$name"_"$$xno" ; \
+-		  $(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+-		    > $(srcdir)/result/schematron/"$$name"_"$$xno" \
+-		    2> $(srcdir)/result/schematron/"$$name"_"$$xno".err; \
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      else \
+-	          log=`$(CHECKER) $(top_builddir)/xmllint$(EXEEXT) --schematron $$i $$j \
+-		    > res.$$name 2> err.$$name;\
+-	          grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	          diff $(srcdir)/result/schematron/"$$name"_"$$xno" \
+-		       res.$$name;\
+-	          diff $(srcdir)/result/schematron/"$$name"_"$$xno".err \
+-		       err.$$name | grep -v "error detected at";\
+-		  grep Unimplemented err.$$name`; \
+-		  if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo $$log ; fi ; \
+-	          rm res.$$name err.$$name ; \
+-	       fi ; fi ; \
+-	  done; done)
+-
+-RelaxNGPythonTests:
+-	@(if [ -x $(PYTHON) ] ; then \
+-	    PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH ; \
+-	    export PYTHONPATH; \
+-	    LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
+-	    export LD_LIBRARY_PATH; \
+-	    echo "## Relax-NG Python based test suite 1" ; \
+-	    $(CHECKER) $(PYTHON) $(srcdir)/check-relaxng-test-suite.py ; \
+-	    echo "## Relax-NG Python based test suite 2" ; \
+-	    $(CHECKER) $(PYTHON) $(srcdir)/check-relaxng-test-suite2.py ; \
+-	  fi)
+-
+-SchemasPythonTests:
+-	@(if [ -x $(PYTHON) ] ; then \
+-	    PYTHONPATH=$(top_builddir)/python:$(top_builddir)/python/.libs:$$PYTHONPATH; \
+-	    export PYTHONPATH; \
+-	    LD_LIBRARY_PATH="$(top_builddir)/.libs:$$LD_LIBRARY_PATH" ; \
+-	    export LD_LIBRARY_PATH; \
+-	    echo "## XML Schemas datatypes Python based test suite" ; \
+-	    echo "## It is normal to see 11 errors reported" ; \
+-	    $(CHECKER) $(PYTHON) $(srcdir)/check-xsddata-test-suite.py ; \
+-	  fi)
+-	@(if [ -x $(PYTHON) -a -d xstc ] ; then cd xstc ; $(MAKE) CHECKER="$(CHECKER)" pytests ; fi)
+-
+-Patterntests: xmllint$(EXEEXT)
+-	@(echo > .memdump)
+-	@echo "## Pattern regression tests"
+-	-@(for i in $(srcdir)/test/pattern/*.pat ; do \
+-	  name=`basename $$i .pat`; \
+-	  if [ -f $(srcdir)/test/pattern/$$name.xml ] ; then \
+-	  if [ ! -f $(srcdir)/result/pattern/$$name ] ; then \
+-	      rm -f result.$$name ; \
+-	      echo New test file $$name ; \
+-	      for pat in `cat $$i` ; do \
+-	      $(CHECKER) $(top_builddir)/xmllint --walker --pattern $$pat $(srcdir)/test/pattern/$$name.xml >> $(srcdir)/result/pattern/$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      done ;\
+-	  else \
+-	      rm -f result.$$name ; \
+-	      lst=`cat $$i` ; \
+-	      log=`for pat in $$lst ; do $(CHECKER) $(top_builddir)/xmllint --walker --pattern $$pat $(srcdir)/test/pattern/$$name.xml 2>&1 >> result.$$name ; \
+-	      grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+-	      done ;\
+-	      diff $(srcdir)/result/pattern/$$name result.$$name` ; \
+-	      if [ -n "$$log" ] ; then echo $$name result ; echo $$log ; fi ; \
+-	      rm result.$$name ; \
+-	  fi ; fi ; done ;)
+-
+-ModuleTests: testModule$(EXEEXT) testdso.la
+-	@echo "## Module tests"
+-	@(./testModule$(EXEEXT))
+-
+ cleanup:
+ 	-@(find . -name .\#\* -exec rm {} \;)
+ 	-@(find . -name \*.gcda -o -name \*.gcno -exec rm -f {} \;)
diff --git a/mingw32-libxml2-static-build-compile-fix.patch b/mingw32-libxml2-static-build-compile-fix.patch
new file mode 100644
index 000000000000..d153092ed06f
--- /dev/null
+++ b/mingw32-libxml2-static-build-compile-fix.patch
@@ -0,0 +1,11 @@
+--- threads.c.orig	2009-09-10 17:03:39.000000000 +0200
++++ threads.c	2009-09-11 19:00:59.660192916 +0200
+@@ -993,7 +993,7 @@
+ #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+ #if defined(LIBXML_STATIC_FOR_DLL)
+ BOOL XMLCALL
+-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
++xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved)
+ #else
+ BOOL WINAPI
+ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)