6 files changed, 18 insertions, 33 deletions
diff --git a/tests/exslt/saxon/Makefile.am b/tests/exslt/saxon/Makefile.am
index 9e7b3160..3ef3a2ca 100644
--- a/tests/exslt/saxon/Makefile.am
+++ b/tests/exslt/saxon/Makefile.am
@@ -29,15 +29,11 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 			mv $$name.bad $(srcdir)/$$name.err ; \
 		fi ; \
 	  else \
-		if  [ ! -s $$name.res ] ; then \
-			echo "Fatal error, no $$name.res\n" ; \
-	  	else \
-			diff $(srcdir)/$$name.out $$name.res ; \
-			if [ -s $(srcdir)/$$name.err ] ; then \
-	  			diff $(srcdir)/$$name.err $$name.bad; \
-			else \
-				diff /dev/null $$name.bad; \
-			fi ; \
+		diff $(srcdir)/$$name.out $$name.res ; \
+		if [ -s $(srcdir)/$$name.err ] ; then \
+			diff $(srcdir)/$$name.err $$name.bad; \
+		else \
+			diff /dev/null $$name.bad; \
 		fi ; \
 	  fi; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
diff --git a/tests/exslt/saxon/Makefile.in b/tests/exslt/saxon/Makefile.in
index b200df3a..b1c2407c 100644
--- a/tests/exslt/saxon/Makefile.in
+++ b/tests/exslt/saxon/Makefile.in
@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = tests/exslt/saxon
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -192,7 +192,6 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MV = @MV@
 M_LIBS = @M_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -209,6 +208,9 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PYTHON = @PYTHON@
 PYTHONSODV = @PYTHONSODV@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
@@ -218,12 +220,10 @@ PYTHON_SUBDIR = @PYTHON_SUBDIR@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RELDATE = @RELDATE@
-RM = @RM@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TAR = @TAR@
 THREAD_LIBS = @THREAD_LIBS@
 VERSION = @VERSION@
 VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@
@@ -242,8 +242,6 @@ XSLTPROCDV = @XSLTPROCDV@
 XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@
 XSLT_LIBDIR = @XSLT_LIBDIR@
 XSLT_LIBS = @XSLT_LIBS@
-XSLT_LOCALE_WINAPI = @XSLT_LOCALE_WINAPI@
-XSLT_LOCALE_XLOCALE = @XSLT_LOCALE_XLOCALE@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -316,9 +314,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/exslt/saxon/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/exslt/saxon/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/exslt/saxon/Makefile
+	  $(AUTOMAKE) --foreign tests/exslt/saxon/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -518,15 +516,11 @@ test tests: $(top_builddir)/xsltproc/xsltproc
 			mv $$name.bad $(srcdir)/$$name.err ; \
 		fi ; \
 	  else \
-		if  [ ! -s $$name.res ] ; then \
-			echo "Fatal error, no $$name.res\n" ; \
-	  	else \
-			diff $(srcdir)/$$name.out $$name.res ; \
-			if [ -s $(srcdir)/$$name.err ] ; then \
-	  			diff $(srcdir)/$$name.err $$name.bad; \
-			else \
-				diff /dev/null $$name.bad; \
-			fi ; \
+		diff $(srcdir)/$$name.out $$name.res ; \
+		if [ -s $(srcdir)/$$name.err ] ; then \
+			diff $(srcdir)/$$name.err $$name.bad; \
+		else \
+			diff /dev/null $$name.bad; \
 		fi ; \
 	  fi; \
 	  grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true`;\
diff --git a/tests/exslt/saxon/eval.2.err b/tests/exslt/saxon/eval.2.err
index df8adfbc..7fdd4320 100644
--- a/tests/exslt/saxon/eval.2.err
+++ b/tests/exslt/saxon/eval.2.err
@@ -2,6 +2,6 @@ XPath error : Invalid expression
 ###
 ^
 XPath error : Invalid expression
-xmlXPathCompiledEval: evaluation failed
 runtime error: file ./eval.2.xsl line 11 element value-of
 XPath evaluation returned no result.
+no result for ./eval.2.xml
diff --git a/tests/exslt/saxon/eval.2.out b/tests/exslt/saxon/eval.2.out
index 3048a905..e69de29b 100644
--- a/tests/exslt/saxon/eval.2.out
+++ b/tests/exslt/saxon/eval.2.out
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<results/>
diff --git a/tests/exslt/saxon/eval.3.err b/tests/exslt/saxon/eval.3.err
index 5a87793b..573d4f68 100644
--- a/tests/exslt/saxon/eval.3.err
+++ b/tests/exslt/saxon/eval.3.err
@@ -1,6 +1,5 @@
 XPath error : Undefined namespace prefix
-xmlXPathCompiledEval: evaluation failed
 XPath error : Invalid expression
-xmlXPathCompiledEval: evaluation failed
 runtime error: file ./eval.3.xsl line 11 element value-of
 XPath evaluation returned no result.
+no result for ./eval.3.xml
diff --git a/tests/exslt/saxon/eval.3.out b/tests/exslt/saxon/eval.3.out
index 3048a905..e69de29b 100644
--- a/tests/exslt/saxon/eval.3.out
+++ b/tests/exslt/saxon/eval.3.out
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
-<results/>