Merge branch 'tizen_base' of ssh://review.tizen.org:29418/platform/upstream/libxml2...

[platform/upstream/libxml2.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index fbe49ec..9fca93b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -81,7 +91,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \
+check_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \
        testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
        testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \
        testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \
@@ -90,15 +100,6 @@ noinst_PROGRAMS = testSchemas$(EXEEXT) testRelax$(EXEEXT) \
        runxmlconf$(EXEEXT) testrecurse$(EXEEXT) testlimits$(EXEEXT)
 bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
 subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-       $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-       $(top_srcdir)/configure $(am__configure_deps) \
-       $(srcdir)/config.h.in $(srcdir)/libxml.spec.in \
-       $(srcdir)/libxml-2.0.pc.in \
-       $(srcdir)/libxml-2.0-uninstalled.pc.in \
-       $(srcdir)/libxml2-config.cmake.in $(srcdir)/xml2-config.in \
-       depcomp COPYING TODO config.guess config.sub install-sh \
-       missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -106,6 +107,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+       $(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -186,7 +189,7 @@ testdso_la_OBJECTS = $(am_testdso_la_OBJECTS)
 testdso_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(testdso_la_LDFLAGS) $(LDFLAGS) -o $@
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS)
 am_runsuite_OBJECTS = runsuite.$(OBJEXT)
 runsuite_OBJECTS = $(am_runsuite_OBJECTS)
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(top_builddir)/libxml2.la \
@@ -406,6 +409,12 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(srcdir)/libxml-2.0-uninstalled.pc.in \
+       $(srcdir)/libxml-2.0.pc.in $(srcdir)/libxml.spec.in \
+       $(srcdir)/libxml2-config.cmake.in $(srcdir)/xml2-config.in \
+       AUTHORS COPYING ChangeLog INSTALL NEWS README TODO compile \
+       config.guess config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -488,6 +497,7 @@ HTML_DIR = @HTML_DIR@
 HTML_OBJ = @HTML_OBJ@
 HTTP_OBJ = @HTTP_OBJ@
 ICONV_LIBS = @ICONV_LIBS@
+ICU_CFLAGS = @ICU_CFLAGS@
 ICU_LIBS = @ICU_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -509,8 +519,10 @@ LIBXML_VERSION_NUMBER = @LIBXML_VERSION_NUMBER@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -817,12 +829,13 @@ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
             check-xsddata-test-suite.py check-xinclude-test-suite.py \
              example/Makefile.am example/gjobread.c example/gjobs.xml \
             $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \
-            libxml2-config.cmake.in \
+            libxml2-config.cmake.in autogen.sh \
             trionan.c trionan.h triostr.c triostr.h trio.c trio.h \
             triop.h triodef.h libxml.h elfgcchack.h xzlib.h buf.h \
             enc.h save.h testThreadsWin32.c genUnicode.py TODO_SCHEMAS \
             dbgen.pl dbgenattr.pl regressions.py regressions.xml \
             README.tests Makefile.tests libxml2.syms timsort.h \
+            README.zOS \
             $(CVS_EXTRA_DIST)
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -850,7 +863,7 @@ all: $(BUILT_SOURCES) config.h
 .SUFFIXES: .c .lo .o .obj
 am--refresh: Makefile
        @:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -863,7 +876,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -877,20 +889,20 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
        $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-       @if test ! -f $@; then rm -f stamp-h1; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+       @test -f $@ || rm -f stamp-h1
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
        @rm -f stamp-h1
        cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
        ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
        rm -f stamp-h1
        touch $@
@@ -1009,8 +1021,8 @@ clean-binPROGRAMS:
        echo " rm -f" $$list; \
        rm -f $$list
 
-clean-noinstPROGRAMS:
-       @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-checkPROGRAMS:
+       @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
        echo " rm -f" $$list; \
        rm -f $$list || exit $$?; \
        test -n "$(EXEEXT)" || exit 0; \
@@ -1224,14 +1236,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1593,7 +1605,7 @@ distdir: $(DISTFILES)
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
        || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+       tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
        $(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -1609,11 +1621,17 @@ dist-xz: distdir
        $(am__post_remove_distdir)
 
 dist-tarZ: distdir
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__post_remove_distdir)
 
 dist-shar: distdir
-       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+       shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -1631,7 +1649,7 @@ dist dist-all:
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lz*) \
@@ -1641,22 +1659,23 @@ distcheck: dist
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
-       mkdir $(distdir)/_build $(distdir)/_inst
+       mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
        chmod a-w $(distdir)
        test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+         && $(am__cd) $(distdir)/_build/sub \
+         && ../../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
+           --srcdir=../.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1710,6 +1729,7 @@ distcleancheck: distclean
               $(distcleancheck_listfiles) ; \
               exit 1; } >&2
 check-am: all-am
+       $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-recursive
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
@@ -1757,8 +1777,8 @@ maintainer-clean-generic:
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-       clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+       clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
        mostlyclean-am
 
 distclean: distclean-recursive
@@ -1837,14 +1857,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 uninstall-man: uninstall-man1 uninstall-man3
 
-.MAKE: $(am__recursive_targets) all check install install-am \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
        install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
        am--refresh check check-am clean clean-binPROGRAMS \
-       clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
-       clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscope \
-       cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+       clean-checkPROGRAMS clean-cscope clean-generic \
+       clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+       cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
        dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
        dist-zip distcheck distclean distclean-compile \
        distclean-generic distclean-hdr distclean-libtool \
@@ -1867,6 +1887,8 @@ uninstall-man: uninstall-man1 uninstall-man3
        uninstall-man uninstall-man1 uninstall-man3 \
        uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 # that one forces the rebuild when "make rebuild" is run on doc/
 rebuild_testapi:
@@ -1884,10 +1906,16 @@ testapi.c: $(srcdir)/gentest.py
 #testOOM_DEPENDENCIES = $(DEPS)
 #testOOM_LDADD= $(LDADDS)
 
-runtests:
+runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
+          testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
        [ -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)
+       $(CHECKER) ./runtest$(EXEEXT) && \
+           $(CHECKER) ./testrecurse$(EXEEXT) && \
+           ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) ./testapi$(EXEEXT) && \
+           $(CHECKER) ./testchar$(EXEEXT) && \
+           $(CHECKER) ./testdict$(EXEEXT) && \
+           $(CHECKER) ./runxmlconf$(EXEEXT)
        @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
            $(MAKE) tests ; fi)
 
@@ -1898,16 +1926,20 @@ check-valgrind valgrind: all
        @echo '## Go get a cup of coffee it is gonna take a while ...'
        $(MAKE) CHECKER='valgrind -q' runtests
 
+asan:
+       @echo '## rebuilding for ASAN'
+       ./configure CFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" CXXFLAGS="-fsanitize=address,undefined -Wformat -Werror=format-security -Werror=array-bounds -g" LDFLAGS="-fsanitize=address,undefined" CC="clang" CXX="clang++" --disable-shared ; OptimOff  ; $(MAKE) clean ; $(MAKE)
+
 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)
+           $(MAKE) -s tests ; fi)
+       @(cd doc/examples ; $(MAKE) -s tests)
 
 APItests: testapi$(EXEEXT)
        @echo "## Running the API regression tests this may take a little while"
-       -@($(CHECKER) $(top_builddir)/testapi -q)
+       -@(ASAN_OPTIONS="$$ASAN_OPTIONS:detect_leaks=0" $(CHECKER) $(top_builddir)/testapi -q)
 
 HTMLtests : testHTML$(EXEEXT)
        @(echo > .memdump)
@@ -1925,7 +1957,7 @@ HTMLtests : testHTML$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name result2.$$name error.$$name ; \
          fi ; fi ; done)
 
@@ -1946,7 +1978,7 @@ HTMLPushtests : testHTML$(EXEEXT)
              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 ; \
+             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"
@@ -1960,7 +1992,7 @@ HTMLPushtests : testHTML$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name.sax ; \
          fi ; fi ; done)
        @echo "## Push HTML SAX regression tests"
@@ -1974,7 +2006,7 @@ HTMLPushtests : testHTML$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name.sax ; \
          fi ; fi ; done)
 
@@ -1995,7 +2027,7 @@ XMLtests : xmllint$(EXEEXT)
              $(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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name result2.$$name ; \
          fi ; fi ; done)
        @echo "## XML regression tests on memory"
@@ -2012,7 +2044,7 @@ XMLtests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              diff result.$$name result2.$$name ; \
              rm result.$$name result2.$$name ; \
          fi ; fi ; done)
@@ -2034,7 +2066,7 @@ XMLPushtests: xmllint$(EXEEXT)
              $(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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name result2.$$name ; \
          fi ; fi ; done)
 
@@ -2055,7 +2087,7 @@ NStests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name error.$$name ; \
          fi ; fi ; done)
 
@@ -2076,7 +2108,7 @@ IDtests : xmllint$(EXEEXT) testXPath$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name error.$$name ; \
          fi ; fi ; done)
 
@@ -2097,7 +2129,25 @@ Errtests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
+             rm result.$$name error.$$name ; \
+         fi ; fi ; done)
+       @echo "## Error cases regression tests (old 1.0)"
+       -@(for i in $(srcdir)/test/errors10/*.xml ; do \
+         name=`basename $$i`; \
+         if [ ! -d $$i ] ; then \
+         if [ ! -f $(srcdir)/result/errors10/$$name ] ; then \
+             echo New test file $$name ; \
+             $(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i \
+                2> $(srcdir)/result/errors10/$$name.err \
+                > $(srcdir)/result/errors10/$$name ; \
+             grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+         else \
+             log=`$(CHECKER) $(top_builddir)/xmllint --oldxml10 $$i 2> error.$$name > result.$$name ; \
+             grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
+             diff $(srcdir)/result/errors10/$$name result.$$name ; \
+             diff $(srcdir)/result/errors10/$$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"
@@ -2114,7 +2164,7 @@ Errtests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm error.$$name ; \
          fi ; fi ; done)
 
@@ -2137,7 +2187,7 @@ XMLenttests : xmllint$(EXEEXT)
              $(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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name result2.$$name ; \
          fi ; fi ; done)
 
@@ -2155,7 +2205,7 @@ URItests : testURI$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        -@(for i in $(srcdir)/test/URI/*.uri ; do \
@@ -2169,7 +2219,7 @@ URItests : testURI$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
 
@@ -2183,13 +2233,13 @@ XPathtests : testXPath$(EXEEXT)
          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 ; \
+             $(CHECKER) $(top_builddir)/testXPath -f --expr $$i > $(srcdir)/result/XPath/expr/$$name 2> /dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
          else \
-             log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i 2>&1 > result.$$name ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -f --expr $$i > result.$$name 2> /dev/null ; \
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done ; \
          for i in $(srcdir)/test/XPath/docs/* ; do \
@@ -2204,10 +2254,10 @@ XPathtests : testXPath$(EXEEXT)
              $(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 ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -f -i $$i $$j > 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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done ; fi ; done)
 
@@ -2225,13 +2275,13 @@ XPtrtests : testXPath$(EXEEXT)
          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 ; \
+             $(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > $(srcdir)/result/XPath/xptr/$$name 2> /dev/null ; \
              grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0"; \
          else \
-             log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j 2>&1 > result.$$name ; \
+             log=`$(CHECKER) $(top_builddir)/testXPath -xptr -f -i $$i $$j > result.$$name 2> /dev/null ; \
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done ; fi ; done)
 
@@ -2250,7 +2300,7 @@ XIncludetests : xmllint$(EXEEXT)
              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 ; \
+             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 \
@@ -2265,7 +2315,7 @@ XIncludetests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name error.$$name ; \
          fi ; fi ; done)
        @(echo > .memdump)
@@ -2282,7 +2332,7 @@ XIncludetests : xmllint$(EXEEXT)
              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 ; \
+             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 \
@@ -2297,7 +2347,7 @@ XIncludetests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name error.$$name ; \
          fi ; fi ; done)
 
@@ -2318,7 +2368,7 @@ Scripttests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name result.$$name.err ; \
          fi ; fi ; done)
 
@@ -2337,7 +2387,7 @@ Catatests : xmlcatalog$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        -@(for i in $(srcdir)/test/catalogs/*.script ; do \
@@ -2352,7 +2402,7 @@ Catatests : xmlcatalog$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## Add and del operations on XML Catalogs"
@@ -2416,7 +2466,7 @@ Readertests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## Reader on memory regression tests"
@@ -2431,7 +2481,7 @@ Readertests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @(echo > .memdump)
@@ -2447,7 +2497,7 @@ Readertests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## Reader entities substitution regression tests"
@@ -2462,7 +2512,7 @@ Readertests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
 
@@ -2480,7 +2530,7 @@ SAXtests : testSAX$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## SAX2 callbacks regression tests"
@@ -2495,7 +2545,22 @@ SAXtests : testSAX$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
+             rm result.$$name ; \
+         fi ; fi ; done)
+       @echo "## SAX2 callbacks regression tests with entity substitution"
+       -@(for i in $(srcdir)/test/* ; do \
+         name=`basename $$i`; \
+         if [ ! -d $$i ] ; then \
+         if [ ! -f $(srcdir)/result/noent/$$name.sax2 ] ; then \
+             echo New test file $$name ; \
+             $(CHECKER) $(top_builddir)/testSAX --sax2 --noent $$i > $(srcdir)/result/noent/$$name.sax2 2> /dev/null ; \
+             grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+         else \
+             log=`$(CHECKER) $(top_builddir)/testSAX --sax2 --noent $$i > result.$$name 2> /dev/null ; \
+             grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0";\
+             diff $(srcdir)/result/noent/$$name.sax2 result.$$name` ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
 
@@ -2507,7 +2572,7 @@ Validtests : xmllint$(EXEEXT)
          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 ; \
+             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 \
@@ -2521,7 +2586,7 @@ Validtests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## General documents valid regression tests"
@@ -2537,7 +2602,7 @@ Validtests : xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name error.$$name ; \
          fi ; fi ; done)
 
@@ -2555,7 +2620,7 @@ Regexptests: testRegexp$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
        @echo "## Formal expresssions regression tests"
@@ -2570,7 +2635,7 @@ Regexptests: testRegexp$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
 
@@ -2588,7 +2653,7 @@ Automatatests: testAutomata$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done)
 
@@ -2639,7 +2704,7 @@ C14Ntests : testC14N$(EXEEXT)
                            cmdline="$$cmdline '`cat $(srcdir)/test/c14n/$$m/$$name.ns`'"; \
                        fi; \
                    fi; \
-                   $$cmdline > $(srcdir)/test/c14n/test.tmp; \
+                   $$cmdline > $(srcdir)/test/c14n/test.tmp 2> /dev/null; \
                    if [ $$? -eq 0 ]; then \
                        diff  $(srcdir)/result/c14n/$$m/$$name $(srcdir)/test/c14n/test.tmp; \
                        if [ $$? -ne 0 ]; then \
@@ -2680,7 +2745,7 @@ Schemastests: testSchemas$(EXEEXT)
                  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 ; \
+                 if [ -n "$$log" ] ; then echo "$$name"_"$$sno"_"$$xno" result ; echo "$$log" ; fi ; \
                  rm res.$$name err.$$name ; \
               fi ; fi ;\
          done; done)
@@ -2705,7 +2770,7 @@ Relaxtests: xmllint$(EXEEXT)
              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 ; \
+             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 \
@@ -2727,7 +2792,7 @@ Relaxtests: xmllint$(EXEEXT)
                  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 ; \
+                 if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo "$$log" ; fi ; \
                  rm res.$$name err.$$name ; \
               fi ; fi ; \
          done; done)
@@ -2753,7 +2818,7 @@ Relaxtests: xmllint$(EXEEXT)
                      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 ; \
+                 if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo "$$log" ; fi ; \
                  rm res.$$name err.$$name ; \
               fi ; fi ; \
          done; done)
@@ -2782,7 +2847,7 @@ Schematrontests: xmllint$(EXEEXT)
                  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 ; \
+                 if [ -n "$$log" ] ; then echo "$$name"_"$$xno" result ; echo "$$log" ; fi ; \
                  rm res.$$name err.$$name ; \
               fi ; fi ; \
          done; done)
@@ -2831,7 +2896,7 @@ Patterntests: xmllint$(EXEEXT)
              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 ; \
+             if [ -n "$$log" ] ; then echo $$name result ; echo "$$log" ; fi ; \
              rm result.$$name ; \
          fi ; fi ; done ;)