[libdap] 19/22: New upstream 3.18.2

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Nov 4 15:20:56 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository libdap.

commit b6c045b9ab4a335e32aa387834763c667ba17cf5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 4 01:25:24 2016 +0000

    New upstream 3.18.2
---
 ChangeLog                                          |    69 +
 Error.tab.cc                                       |    30 +-
 Error.tab.hh                                       |     8 +-
 Grid.cc                                            |    23 +-
 INSTALL                                            |    15 +-
 Makefile.in                                        |     3 +-
 NEWS                                               |    11 +
 README                                             |    10 +-
 Vector.h                                           |     2 +-
 XDRStreamMarshaller.cc                             |     5 +-
 aclocal.m4                                         |     4 +-
 ce_expr.tab.cc                                     |   274 +-
 ce_expr.tab.hh                                     |     8 +-
 conf/libtool.m4                                    |     5 +-
 config.h.in                                        |    19 +-
 configure                                          | 27392 ++++++++++-----
 configure.ac                                       |    10 +-
 d4_ce/D4ConstraintEvaluator.cc                     |    18 +
 d4_ce/D4ConstraintEvaluator.h                      |     2 +
 d4_ce/Makefile.in                                  |     1 -
 d4_ce/d4_ce_parser.tab.cc                          |   124 +-
 d4_ce/d4_ce_parser.tab.hh                          |    13 +-
 d4_ce/d4_ce_parser.yy                              |    17 +-
 d4_ce/d4_ce_scanner.ll                             |     2 +-
 d4_ce/location.hh                                  |     8 +-
 d4_ce/position.hh                                  |     8 +-
 d4_ce/stack.hh                                     |     8 +-
 d4_function/Makefile.in                            |     1 -
 d4_function/d4_function_parser.tab.cc              |     4 +-
 d4_function/d4_function_parser.tab.hh              |    12 +-
 d4_function/location.hh                            |     8 +-
 d4_function/position.hh                            |     8 +-
 d4_function/stack.hh                               |     8 +-
 das.tab.cc                                         |   190 +-
 das.tab.hh                                         |     4 +-
 dds.tab.cc                                         |   154 +-
 dds.tab.hh                                         |     8 +-
 gl/Makefile.in                                     |     1 -
 lex.Error.cc                                       |    54 +-
 lex.ce_expr.cc                                     |    54 +-
 lex.das.cc                                         |    54 +-
 lex.dds.cc                                         |    54 +-
 libdap.spec                                        |     2 +-
 tests/DASTest                                      |  4075 ++-
 tests/DDSTest                                      |  5620 ++--
 tests/DMRTest                                      | 32924 ++++++++++++-------
 tests/DMRTest.at                                   |    15 +
 tests/EXPRTest                                     | 16660 ++++++----
 tests/Makefile.in                                  |     1 -
 tests/dmr-testsuite/.DS_Store                      |   Bin 6148 -> 0 bytes
 tests/dmr-testsuite/._.DS_Store                    |   Bin 120 -> 0 bytes
 .../big-endian/test_array_3.1.dmr.1.trans_base     |    33 +
 .../big-endian/test_array_3.1.dmr.2.trans_base     |    27 +
 .../big-endian/test_array_3.1.dmr.3.trans_base     |    25 +
 .../big-endian/test_array_3.1.dmr.4.trans_base     |    25 +
 .../big-endian/test_array_3.1.dmr.5.trans_base     |    27 +
 tests/dmr-testsuite/names_with_spaces.dmr          |    31 +
 tests/dmr-testsuite/names_with_spaces2.dmr         |    33 +
 tests/dmr-testsuite/names_with_spaces3.dmr         |    33 +
 .../universal/names_with_spaces.dmr.1.trans_base   |    35 +
 .../universal/test_simple_7.xml.f.trans_base~      |    22 -
 tests/expr-testsuite/data.21.base~                 |     6 -
 tests/expr-testsuite/data.24.base.tmp~             |    10 -
 tests/getdapTest                                   |  1608 +-
 tests/package.m4                                   |     4 +-
 unit-tests/D4FilterClauseTest.cc                   |     2 +-
 unit-tests/Makefile.in                             |     1 -
 unit-tests/cache-testsuite/Makefile.in             |     1 -
 unit-tests/test_config.h                           |     2 +-
 util.cc                                            |     5 +-
 xdr-datatypes.h                                    |     4 +-
 71 files changed, 57396 insertions(+), 32538 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ced5fd..ae1f6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+2016-11-01  James Gallagher  <jgallagher at opendap.org>
+
+	Formatting Grid.cc
+
+2016-10-20  James Gallagher  <jgallagher at opendap.org>
+
+	Fixed Hyrax-267
+	The DAP4 ce parser was not removing double quotes or the %<hex>
+	escaping, so names that needed those were not 'found' in the
+	dataset. Also, the grammar used by the parser had a syntax error
+	in it where /s in the id name were turned into dots and the
+	resulting names could not be found. The result was a valid names
+	were being rejected.
+
+2016-10-12  James Gallagher  <jgallagher at opendap.org>
+
+	Corrected a comment in Vector.h
+
+2016-08-30  James Gallagher  <jgallagher at opendap.org>
+
+	Merge pull request #22 from sharkcz/getopt
+	type fix for getopt
+
+2016-08-30  Dan Horák  <dan at danny.cz>
+
+	type fix for getopt
+
+	The getopt() function uses int as return type and using char for a
+	variable storing the return value makes problem on platform where
+	char is unsgined by default.
+	http://www.arm.linux.org.uk/docs/faqs/signedchar.php
+
+	Fix by Orion Poplawski <orion[at]cora.nwra.com> for
+	https://bugzilla.redhat.com/show_bug.cgi?id=1366787
+
+2016-08-26  James Gallagher  <jgallagher at opendap.org>
+
+	Merge pull request #21 from sharkcz/dmr-bigendian-2
+	add missing big endian baselines
+
+2016-08-26  Dan Horák  <dan at danny.cz>
+
+	add missing big endian baselines
+
+2016-08-22  James Gallagher  <jgallagher at opendap.org>
+
+	Added main_page.doxygen to gitignore
+
+2016-07-14  James Gallagher  <jgallagher at opendap.org>
+
+	Merge branch 'master' of https://github.com/opendap/libdap4
+
+	Added libuuid to the requirements listed in INSTALL.
+	Also added a comment and fixed error message text in util.cc for
+	void extract_double_array(Array *a, vector<double> &dest)
+
+2016-06-09  James Gallagher  <jgallagher at opendap.org>
+
+	Fixed a compiler warning when USE_POSIX_THREADS is not def'd in XDRStreamMarshaller
+
+2016-06-08  James Gallagher  <jgallagher at opendap.org>
+
+	Removed generagted file since it's causing grief on Travis
+
+	Updates for the source dist and unit-tests
+
+2016-05-31  James Gallagher  <jgallagher at opendap.org>
+
+	Version 3.18.0
 2016-05-25  James Gallagher  <jgallagher at opendap.org>
 
 	Fixed ugly DBG2() macro calls
diff --git a/Error.tab.cc b/Error.tab.cc
index 8c8d76d..4e39786 100644
--- a/Error.tab.cc
+++ b/Error.tab.cc
@@ -1259,56 +1259,56 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 103 "Error.yy" /* yacc.c:1661  */
+#line 103 "Error.yy" /* yacc.c:1646  */
     { (yyval.boolean) = (yyvsp[-2].boolean); STATUS(arg) = (yyvsp[-2].boolean); }
-#line 1265 "Error.tab.cc" /* yacc.c:1661  */
+#line 1265 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 106 "Error.yy" /* yacc.c:1661  */
+#line 106 "Error.yy" /* yacc.c:1646  */
     { (yyval.boolean) = (yyvsp[0].boolean); }
-#line 1271 "Error.tab.cc" /* yacc.c:1661  */
+#line 1271 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 109 "Error.yy" /* yacc.c:1661  */
+#line 109 "Error.yy" /* yacc.c:1646  */
     { (yyval.boolean) = (yyvsp[-1].boolean) && (yyvsp[0].boolean); }
-#line 1277 "Error.tab.cc" /* yacc.c:1661  */
+#line 1277 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 110 "Error.yy" /* yacc.c:1661  */
+#line 110 "Error.yy" /* yacc.c:1646  */
     { (yyval.boolean) = (yyvsp[0].boolean); }
-#line 1283 "Error.tab.cc" /* yacc.c:1661  */
+#line 1283 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 114 "Error.yy" /* yacc.c:1661  */
+#line 114 "Error.yy" /* yacc.c:1646  */
     { 
 		    ERROR_OBJ(arg)->set_error_code((ErrorCode)(yyvsp[-1].integer));
 		    (yyval.boolean) = true; 
 		}
-#line 1292 "Error.tab.cc" /* yacc.c:1661  */
+#line 1292 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 121 "Error.yy" /* yacc.c:1661  */
+#line 121 "Error.yy" /* yacc.c:1646  */
     { 
 		    ERROR_OBJ(arg)->set_error_message((yyvsp[0].string));
 		}
-#line 1300 "Error.tab.cc" /* yacc.c:1661  */
+#line 1300 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 125 "Error.yy" /* yacc.c:1661  */
+#line 125 "Error.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = true;
 		}
-#line 1308 "Error.tab.cc" /* yacc.c:1661  */
+#line 1308 "Error.tab.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1312 "Error.tab.cc" /* yacc.c:1661  */
+#line 1312 "Error.tab.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/Error.tab.hh b/Error.tab.hh
index a0b0432..8757ad7 100644
--- a/Error.tab.hh
+++ b/Error.tab.hh
@@ -40,7 +40,7 @@
 extern int Errordebug;
 #endif
 /* "%code requires" blocks.  */
-#line 32 "Error.yy" /* yacc.c:1915  */
+#line 32 "Error.yy" /* yacc.c:1909  */
 
 
 #include "config_dap.h"
@@ -69,7 +69,7 @@ using namespace libdap;
 extern int error_line_num;	// defined in Error.lex
 
 
-#line 73 "Error.tab.hh" /* yacc.c:1915  */
+#line 73 "Error.tab.hh" /* yacc.c:1909  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -89,7 +89,7 @@ extern int error_line_num;	// defined in Error.lex
 
 union YYSTYPE
 {
-#line 75 "Error.yy" /* yacc.c:1915  */
+#line 75 "Error.yy" /* yacc.c:1909  */
 
 #ifdef __SUNPRO_CC
     int boolean;
@@ -99,7 +99,7 @@ union YYSTYPE
     int integer;
     char *string;
 
-#line 103 "Error.tab.hh" /* yacc.c:1915  */
+#line 103 "Error.tab.hh" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/Grid.cc b/Grid.cc
index 338f0c0..821250c 100644
--- a/Grid.cc
+++ b/Grid.cc
@@ -816,12 +816,11 @@ Grid::print_val(FILE *out, string space, bool print_decl_p)
     fwrite(oss.str().data(), sizeof(char), oss.str().length(), out);
 }
 
-void
-Grid::print_val(ostream &out, string space, bool print_decl_p)
+void Grid::print_val(ostream &out, string space, bool print_decl_p)
 {
     if (print_decl_p) {
         print_decl(out, space, false);
-	out << " = " ;
+        out << " = ";
     }
 
     // If we are printing a value on the client-side, projection_yields_grid
@@ -830,19 +829,21 @@ Grid::print_val(ostream &out, string space, bool print_decl_p)
     // the value of this function should be ignored. 4/6/2000 jhrg
     bool pyg = projection_yields_grid(); // hack 12/1/99 jhrg
     if (pyg || !send_p())
-	out << "{  Array: " ;
+        out << "{  Array: ";
     else
-	out << "{" ;
+        out << "{";
+
     get_array()->print_val(out, "", false);
-    if (pyg || !send_p())
-	out << "  Maps: " ;
-    for (Map_citer i = map_begin(); i != map_end(); i++, (void)(i != map_end() && out << ", ")) {
+
+    if (pyg || !send_p()) out << "  Maps: ";
+
+    for (Map_citer i = map_begin(); i != map_end(); i++, (void) (i != map_end() && out << ", ")) {
         (*i)->print_val(out, "", false);
     }
-    out << " }" ;
 
-    if (print_decl_p)
-	out << ";\n" ;
+    out << " }";
+
+    if (print_decl_p) out << ";\n";
 }
 
 // Grids have ugly semantics.
diff --git a/INSTALL b/INSTALL
index 251db88..caa7687 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Updated for version 3.18.0 of the OPeNDAP DAP2/4 library software.
+Updated for version 3.18.2 of the OPeNDAP DAP2/4 library software.
 
 Installing the DAP2/4 library
 
@@ -47,9 +47,6 @@ Building from Our GIT Repository
   in parallel on multi core machines and add TESTSUITEFLAGS=-j9 to make
   check to run the regression tests in parallel.
 
-  Make certain that you have recent versions of autoconf, automake and
-  libtool.
-
 AFTER INSTALLING
 
   o Set the PATH environment variable to include the bin directory where
@@ -77,13 +74,13 @@ REQUIREMENTS
     --verbose' and then build as described above. You also need bison 3
     and flex 2.5.35 or greater.
 
-  o The library uses libcurl and libxml2. You will need these libraries
-    installed on your system to successfully run configure and build the
-    library. You must have libcurl version 7.19.0 or newer and libxml2 2.7.0
-    or newer.
+  o The library uses libcurl, libxml2 and libuuid (the latter on linux 
+    but not OSX). You will need these libraries installed on your system
+    to successfully run configure and build the library. You must have
+    libcurl version 7.19.0 or newer and libxml2 2.7.0 or newer.
 
   o If you are concerned about introducing problems with your OS's package
-    system, build and install curl, et c., into a special directory (e.g.,
+    system, build and install curl, etc., into a special directory (e.g.,
     /opt/opendap/) and then be sure to set PATH to include the curl-config
     and xml2-config scripts before running configure (e.g., run configure as
     'PATH="$PATH:/opt/opendap/bin';./configure'). You probably should install
diff --git a/Makefile.in b/Makefile.in
index acd7539..e558d7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -745,7 +745,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
@@ -2431,7 +2430,7 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
diff --git a/NEWS b/NEWS
index 88e934c..f56ea4c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+News for version 3.18.2
+
+Fixed an issue with DAP4 CE parsing, double quotes and %20 escape
+characters.
+
+Type fix for getopt() for platforms where char is unsigned by default.
+
+Added more bigendian test baselines.
+
+Added libuuid to the requirements listed in INSTALL.
+
 News for version 3.18.1
 
 Minor fix for the source distribution.
diff --git a/README b/README
index 37391ee..99ea12d 100644
--- a/README
+++ b/README
@@ -1,13 +1,9 @@
-Updated for version 3.18.0
 
-Added support for DAP4 filter operations.
-
-For otehr information, see NEWS and ChangeLog
+Updated for version 3.18.2
 
-Updated for version 3.17.2
+Added support for DAP4 filter operations.
 
-Bug fixes and improved error messages; see NEWS and ChangeLog for 
-details.
+For other information, see NEWS and ChangeLog
 
 Updated for 3.16.0
 
diff --git a/Vector.h b/Vector.h
index c20d1f3..74ace0b 100644
--- a/Vector.h
+++ b/Vector.h
@@ -133,7 +133,7 @@ public:
      *
      * @note Added so that the NCML handler can code some optimizations in its
      * specialized versions of Array. jhrg 8/14/15
-     * @return A reference to the data buffer for Vectors/Arrays of the cardinal types.
+     * @return A pointer to the data buffer for Vectors/Arrays of the cardinal types.
      */
     char *get_buf() {
         return d_buf;
diff --git a/XDRStreamMarshaller.cc b/XDRStreamMarshaller.cc
index 119755e..3da6503 100644
--- a/XDRStreamMarshaller.cc
+++ b/XDRStreamMarshaller.cc
@@ -91,8 +91,11 @@ XDRStreamMarshaller::XDRStreamMarshaller(ostream &out) :
 
 XDRStreamMarshaller::~XDRStreamMarshaller()
 {
+    // Added this because when USE_POS... is not defined, 'tm' has no
+    // type, which the compiler complains about.
+#ifdef USE_POSIX_THREADS
     delete tm;
-
+#endif
     xdr_destroy(&d_sink);
 }
 
diff --git a/aclocal.m4 b/aclocal.m4
index 870740a..d0670b8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/ce_expr.tab.cc b/ce_expr.tab.cc
index fa0b19f..9ede58e 100644
--- a/ce_expr.tab.cc
+++ b/ce_expr.tab.cc
@@ -1474,47 +1474,47 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 241 "ce_expr.yy" /* yacc.c:1661  */
+#line 241 "ce_expr.yy" /* yacc.c:1646  */
     {
              DBG(cerr << "Mark all variables" << endl);
 		     DDS(arg)->mark_all(true);
 		     (yyval.boolean) = true;
 		 }
-#line 1484 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1484 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 249 "ce_expr.yy" /* yacc.c:1661  */
+#line 249 "ce_expr.yy" /* yacc.c:1646  */
     { DDS(arg)->mark_all(true); }
-#line 1490 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1490 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 250 "ce_expr.yy" /* yacc.c:1661  */
+#line 250 "ce_expr.yy" /* yacc.c:1646  */
     { 
 		     (yyval.boolean) = (yyvsp[0].boolean);
 		 }
-#line 1498 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1498 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 254 "ce_expr.yy" /* yacc.c:1661  */
+#line 254 "ce_expr.yy" /* yacc.c:1646  */
     {
 		     (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
 		 }
-#line 1506 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1506 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 261 "ce_expr.yy" /* yacc.c:1661  */
+#line 261 "ce_expr.yy" /* yacc.c:1646  */
     {
 		     (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
 		 }
-#line 1514 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1514 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 267 "ce_expr.yy" /* yacc.c:1661  */
+#line 267 "ce_expr.yy" /* yacc.c:1646  */
     {
 		     BaseType *var = DDS(arg)->var((yyvsp[0].id));
 		     if (var) {
@@ -1526,27 +1526,27 @@ yyreduce:
 			     no_such_ident(arg, (yyvsp[0].id), "identifier");
 		     }
 		}
-#line 1530 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1530 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 279 "ce_expr.yy" /* yacc.c:1661  */
+#line 279 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = (yyvsp[0].boolean);
 		}
-#line 1538 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1538 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 283 "ce_expr.yy" /* yacc.c:1661  */
+#line 283 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = (yyvsp[0].boolean);
 		}
-#line 1546 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1546 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 287 "ce_expr.yy" /* yacc.c:1661  */
+#line 287 "ce_expr.yy" /* yacc.c:1646  */
     {
             Array *array = dynamic_cast<Array*>((yyvsp[0].rval_ptr)->bvalue(*DDS(arg)));
             if (array) { 
@@ -1564,67 +1564,67 @@ yyreduce:
                 return false;
             }
         }
-#line 1568 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1568 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 311 "ce_expr.yy" /* yacc.c:1661  */
+#line 311 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_byte, Byte>((yyvsp[-1].byte_values), DDS(arg));
         }
-#line 1576 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1576 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 317 "ce_expr.yy" /* yacc.c:1661  */
+#line 317 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_int16, Int16>((yyvsp[-1].int16_values), DDS(arg));
         }
-#line 1584 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1584 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 323 "ce_expr.yy" /* yacc.c:1661  */
+#line 323 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_uint16, UInt16>((yyvsp[-1].uint16_values), DDS(arg));
         }
-#line 1592 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1592 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 329 "ce_expr.yy" /* yacc.c:1661  */
+#line 329 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_int32, Int32>((yyvsp[-1].int32_values), DDS(arg));
         }
-#line 1600 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1600 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 335 "ce_expr.yy" /* yacc.c:1661  */
+#line 335 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_uint32, UInt32>((yyvsp[-1].uint32_values), DDS(arg));
         }
-#line 1608 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1608 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 341 "ce_expr.yy" /* yacc.c:1661  */
+#line 341 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_float32, Float32>((yyvsp[-1].float32_values), DDS(arg));
         }
-#line 1616 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1616 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 347 "ce_expr.yy" /* yacc.c:1661  */
+#line 347 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = build_constant_array<dods_float64, Float64>((yyvsp[-1].float64_values), DDS(arg));
         }
-#line 1624 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1624 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 356 "ce_expr.yy" /* yacc.c:1661  */
+#line 356 "ce_expr.yy" /* yacc.c:1646  */
     {
               if (!check_int32((yyvsp[0].id)))
                   throw Error(malformed_expr, "$<type>(hint, value, ...) special form expected hint to be an integer");
@@ -1632,179 +1632,179 @@ yyreduce:
               arg_length_hint_value = atoi((yyvsp[0].id));
               (yyval.boolean) = true;
           }
-#line 1636 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1636 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 367 "ce_expr.yy" /* yacc.c:1661  */
+#line 367 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.byte_values) = make_fast_arg_list<byte_arg_list, dods_byte>(arg_length_hint_value, (yyvsp[0].byte_value));
           }
-#line 1644 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1644 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 371 "ce_expr.yy" /* yacc.c:1661  */
+#line 371 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.byte_values) = make_fast_arg_list<byte_arg_list, dods_byte>((yyvsp[-2].byte_values), (yyvsp[0].byte_value));
           }
-#line 1652 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1652 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 378 "ce_expr.yy" /* yacc.c:1661  */
+#line 378 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.byte_value) = strtol((yyvsp[0].id), 0, 0);
           }
-#line 1660 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1660 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 385 "ce_expr.yy" /* yacc.c:1661  */
+#line 385 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int16_values) = make_fast_arg_list<int16_arg_list, dods_int16>(arg_length_hint_value, (yyvsp[0].int16_value));
           }
-#line 1668 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1668 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 389 "ce_expr.yy" /* yacc.c:1661  */
+#line 389 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int16_values) = make_fast_arg_list<int16_arg_list, dods_int16>((yyvsp[-2].int16_values), (yyvsp[0].int16_value));
           }
-#line 1676 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1676 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 396 "ce_expr.yy" /* yacc.c:1661  */
+#line 396 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int16_value) = strtol((yyvsp[0].id), 0, 0);
           }
-#line 1684 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1684 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 403 "ce_expr.yy" /* yacc.c:1661  */
+#line 403 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint16_values) = make_fast_arg_list<uint16_arg_list, dods_uint16>(arg_length_hint_value, (yyvsp[0].uint16_value));
           }
-#line 1692 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1692 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 407 "ce_expr.yy" /* yacc.c:1661  */
+#line 407 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint16_values) = make_fast_arg_list<uint16_arg_list, dods_uint16>((yyvsp[-2].uint16_values), (yyvsp[0].uint16_value));
           }
-#line 1700 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1700 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 414 "ce_expr.yy" /* yacc.c:1661  */
+#line 414 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint16_value) = strtoul((yyvsp[0].id), 0, 0);
           }
-#line 1708 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1708 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 421 "ce_expr.yy" /* yacc.c:1661  */
+#line 421 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int32_values) = make_fast_arg_list<int32_arg_list, dods_int32>(arg_length_hint_value, (yyvsp[0].int32_value));
           }
-#line 1716 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1716 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 425 "ce_expr.yy" /* yacc.c:1661  */
+#line 425 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int32_values) = make_fast_arg_list<int32_arg_list, dods_int32>((yyvsp[-2].int32_values), (yyvsp[0].int32_value));
           }
-#line 1724 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1724 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 432 "ce_expr.yy" /* yacc.c:1661  */
+#line 432 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.int32_value) = strtol((yyvsp[0].id), 0, 0);
           }
-#line 1732 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1732 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 439 "ce_expr.yy" /* yacc.c:1661  */
+#line 439 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint32_values) = make_fast_arg_list<uint32_arg_list, dods_uint32>(arg_length_hint_value, (yyvsp[0].uint32_value));
           }
-#line 1740 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1740 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 443 "ce_expr.yy" /* yacc.c:1661  */
+#line 443 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint32_values) = make_fast_arg_list<uint32_arg_list, dods_uint32>((yyvsp[-2].uint32_values), (yyvsp[0].uint32_value));
           }
-#line 1748 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1748 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 450 "ce_expr.yy" /* yacc.c:1661  */
+#line 450 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.uint32_value) = strtoul((yyvsp[0].id), 0, 0);
           }
-#line 1756 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1756 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 457 "ce_expr.yy" /* yacc.c:1661  */
+#line 457 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float32_values) = make_fast_arg_list<float32_arg_list, dods_float32>(arg_length_hint_value, (yyvsp[0].float32_value));
           }
-#line 1764 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1764 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 461 "ce_expr.yy" /* yacc.c:1661  */
+#line 461 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float32_values) = make_fast_arg_list<float32_arg_list, dods_float32>((yyvsp[-2].float32_values), (yyvsp[0].float32_value));
           }
-#line 1772 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1772 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 468 "ce_expr.yy" /* yacc.c:1661  */
+#line 468 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float32_value) = strtof((yyvsp[0].id), 0);
           }
-#line 1780 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1780 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 475 "ce_expr.yy" /* yacc.c:1661  */
+#line 475 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float64_values) = make_fast_arg_list<float64_arg_list, dods_float64>(arg_length_hint_value, (yyvsp[0].float64_value));
           }
-#line 1788 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1788 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 479 "ce_expr.yy" /* yacc.c:1661  */
+#line 479 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float64_values) = make_fast_arg_list<float64_arg_list, dods_float64>((yyvsp[-2].float64_values), (yyvsp[0].float64_value));
           }
-#line 1796 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1796 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 486 "ce_expr.yy" /* yacc.c:1661  */
+#line 486 "ce_expr.yy" /* yacc.c:1646  */
     {
               (yyval.float64_value) = strtod((yyvsp[0].id), 0);
           }
-#line 1804 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1804 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 493 "ce_expr.yy" /* yacc.c:1661  */
+#line 493 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    proj_func p_f = 0;
 		    btp_func f = 0;
@@ -1824,19 +1824,19 @@ yyreduce:
 			    no_such_func(arg, (yyvsp[-3].id));
 		    }
 		}
-#line 1828 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1828 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 516 "ce_expr.yy" /* yacc.c:1661  */
+#line 516 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = (yyvsp[-2].boolean) && (yyvsp[0].boolean);
 		}
-#line 1836 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1836 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 522 "ce_expr.yy" /* yacc.c:1661  */
+#line 522 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    if ((yyvsp[-4].rval_ptr)) {
 			EVALUATOR(arg)->append_clause((yyvsp[-3].op), (yyvsp[-4].rval_ptr), (yyvsp[-1].r_val_l_ptr));
@@ -1845,11 +1845,11 @@ yyreduce:
 		    else
 			(yyval.boolean) = false;
 		}
-#line 1849 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1849 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 531 "ce_expr.yy" /* yacc.c:1661  */
+#line 531 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    if ((yyvsp[-2].rval_ptr)) {
 			rvalue_list *rv = new rvalue_list;
@@ -1860,19 +1860,19 @@ yyreduce:
 		    else
 			(yyval.boolean) = false;
 		}
-#line 1864 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1864 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 542 "ce_expr.yy" /* yacc.c:1661  */
+#line 542 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = (yyvsp[0].boolean);
 		}
-#line 1872 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1872 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 549 "ce_expr.yy" /* yacc.c:1661  */
+#line 549 "ce_expr.yy" /* yacc.c:1646  */
     {
 		   bool_func b_func = get_function((*EVALUATOR(arg)), (yyvsp[-3].id));
 		   if (!b_func) {
@@ -1883,11 +1883,11 @@ yyreduce:
 		       (yyval.boolean) = true;
 		   }
 	       }
-#line 1887 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1887 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 564 "ce_expr.yy" /* yacc.c:1661  */
+#line 564 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    btp_func func = get_btp_function((*EVALUATOR(arg)), (yyvsp[-3].id));
 		    if (func) {
@@ -1897,65 +1897,65 @@ yyreduce:
 			    no_such_func(arg, (yyvsp[-3].id));
 		    }
 		}
-#line 1901 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1901 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 574 "ce_expr.yy" /* yacc.c:1661  */
+#line 574 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = (yyvsp[0].rval_ptr);
         }
-#line 1909 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1909 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 578 "ce_expr.yy" /* yacc.c:1661  */
+#line 578 "ce_expr.yy" /* yacc.c:1646  */
     {
             (yyval.rval_ptr) = (yyvsp[0].rval_ptr);
         }
-#line 1917 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1917 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 584 "ce_expr.yy" /* yacc.c:1661  */
+#line 584 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    if ((yyvsp[0].rval_ptr))
 			    (yyval.r_val_l_ptr) = make_rvalue_list((yyvsp[0].rval_ptr));
 		    else
 			    (yyval.r_val_l_ptr) = 0;
 		}
-#line 1928 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1928 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 591 "ce_expr.yy" /* yacc.c:1661  */
+#line 591 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    if ((yyvsp[-2].r_val_l_ptr) && (yyvsp[0].rval_ptr))
 			    (yyval.r_val_l_ptr) = append_rvalue_list((yyvsp[-2].r_val_l_ptr), (yyvsp[0].rval_ptr));
 		    else
 			    (yyval.r_val_l_ptr) = 0;
 		}
-#line 1939 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1939 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 600 "ce_expr.yy" /* yacc.c:1661  */
+#line 600 "ce_expr.yy" /* yacc.c:1646  */
     {  
 		      (yyval.r_val_l_ptr) = (yyvsp[0].r_val_l_ptr);
 	      }
-#line 1947 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1947 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 604 "ce_expr.yy" /* yacc.c:1661  */
+#line 604 "ce_expr.yy" /* yacc.c:1646  */
     { 
 		      (yyval.r_val_l_ptr) = 0; 
 	      }
-#line 1955 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1955 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 610 "ce_expr.yy" /* yacc.c:1661  */
+#line 610 "ce_expr.yy" /* yacc.c:1646  */
     { 
 		    BaseType *btp = DDS(arg)->var(www2id((yyvsp[0].id)));
 		    if (btp) {
@@ -1993,11 +1993,11 @@ yyreduce:
 			    (yyval.rval_ptr) = new rvalue(btp);
 		    }
 		}
-#line 1997 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 1997 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 648 "ce_expr.yy" /* yacc.c:1661  */
+#line 648 "ce_expr.yy" /* yacc.c:1646  */
     {
                     if ((yyvsp[0].val).type != dods_str_c || (yyvsp[0].val).v.s == 0 || (yyvsp[0].val).v.s->empty())
                         ce_exprerror(arg, "Malformed string", "");
@@ -2016,11 +2016,11 @@ yyreduce:
 		    // See ticket 2240. jhrg 7/30/14
 		    delete (yyvsp[0].val).v.s;
                 }
-#line 2020 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2020 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 672 "ce_expr.yy" /* yacc.c:1661  */
+#line 672 "ce_expr.yy" /* yacc.c:1646  */
     {
                     if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
                       no_such_ident(arg, (yyvsp[-1].id), "array, grid or sequence");
@@ -2031,19 +2031,19 @@ yyreduce:
                     DDS(arg)->mark((yyvsp[-1].id), true);
                     (yyval.rval_ptr) = new rvalue(DDS(arg)->var((yyvsp[-1].id)));
                 }
-#line 2035 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2035 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 685 "ce_expr.yy" /* yacc.c:1661  */
+#line 685 "ce_expr.yy" /* yacc.c:1646  */
     {
                     (yyval.boolean) = (*DDS(arg)).mark((yyvsp[0].id), true);
                 }
-#line 2043 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2043 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 691 "ce_expr.yy" /* yacc.c:1661  */
+#line 691 "ce_expr.yy" /* yacc.c:1646  */
     {
                     //string name = www2id($1);
                     if (!bracket_projection((*DDS(arg)), (yyvsp[-1].id), (yyvsp[0].int_ll_ptr)))
@@ -2052,21 +2052,21 @@ yyreduce:
                     strncpy((yyval.id), (yyvsp[-1].id), ID_MAX-1);
                     (yyval.id)[ID_MAX-1] = '\0';
                 }
-#line 2056 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2056 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 700 "ce_expr.yy" /* yacc.c:1661  */
+#line 700 "ce_expr.yy" /* yacc.c:1646  */
     {
                     string name = string((yyvsp[-1].id)) + string((yyvsp[0].id));
                     strncpy((yyval.id), name.c_str(), ID_MAX-1);
                     (yyval.id)[ID_MAX-1] = '\0';
                 }
-#line 2066 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2066 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 706 "ce_expr.yy" /* yacc.c:1661  */
+#line 706 "ce_expr.yy" /* yacc.c:1646  */
     {
                     string name = string((yyvsp[-2].id)) + string((yyvsp[-1].id));
                     if (!bracket_projection((*DDS(arg)), name.c_str(), (yyvsp[0].int_ll_ptr)))
@@ -2075,20 +2075,20 @@ yyreduce:
                     strncpy((yyval.id), name.c_str(), ID_MAX-1);
                     (yyval.id)[ID_MAX-1] = '\0';
                 }
-#line 2079 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2079 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 717 "ce_expr.yy" /* yacc.c:1661  */
+#line 717 "ce_expr.yy" /* yacc.c:1646  */
     { 
                     strncpy((yyval.id), www2id((yyvsp[0].id)).c_str(), ID_MAX-1);
                     (yyval.id)[ID_MAX-1] = '\0';
                 }
-#line 2088 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2088 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 722 "ce_expr.yy" /* yacc.c:1661  */
+#line 722 "ce_expr.yy" /* yacc.c:1646  */
     {
                     if ((yyvsp[0].val).type != dods_str_c || (yyvsp[0].val).v.s == 0 || (yyvsp[0].val).v.s->empty())
                         ce_exprerror(arg, "Malformed string", "");
@@ -2100,27 +2100,27 @@ yyreduce:
 
                     (yyval.id)[ID_MAX-1] = '\0';
                 }
-#line 2104 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2104 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 736 "ce_expr.yy" /* yacc.c:1661  */
+#line 736 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.int_ll_ptr) = make_array_indices((yyvsp[0].int_l_ptr));
 		}
-#line 2112 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2112 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 740 "ce_expr.yy" /* yacc.c:1661  */
+#line 740 "ce_expr.yy" /* yacc.c:1646  */
     {
 		    (yyval.int_ll_ptr) = append_array_index((yyvsp[-1].int_ll_ptr), (yyvsp[0].int_l_ptr));
 		}
-#line 2120 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2120 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 754 "ce_expr.yy" /* yacc.c:1661  */
+#line 754 "ce_expr.yy" /* yacc.c:1646  */
     {
     if (!check_uint32((yyvsp[-1].id)))
         throw Error(malformed_expr, "The word `" + string((yyvsp[-1].id)) + "' is not a valid array index.");
@@ -2129,22 +2129,22 @@ yyreduce:
     i.v.i = atoi((yyvsp[-1].id));
     (yyval.int_l_ptr) = make_array_index(i);
 }
-#line 2133 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2133 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 763 "ce_expr.yy" /* yacc.c:1661  */
+#line 763 "ce_expr.yy" /* yacc.c:1646  */
     {
     value i;
     i.type = dods_int32_c;
     i.v.i =-1;
     (yyval.int_l_ptr) = make_array_index(i);
 }
-#line 2144 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2144 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 770 "ce_expr.yy" /* yacc.c:1661  */
+#line 770 "ce_expr.yy" /* yacc.c:1646  */
     {
     if (!check_uint32((yyvsp[-3].id)))
         throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
@@ -2156,11 +2156,11 @@ yyreduce:
     j.v.i = atoi((yyvsp[-1].id));
     (yyval.int_l_ptr) = make_array_index(i, j);
 }
-#line 2160 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2160 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 782 "ce_expr.yy" /* yacc.c:1661  */
+#line 782 "ce_expr.yy" /* yacc.c:1646  */
     {
     if (!check_uint32((yyvsp[-3].id)))
         throw Error(malformed_expr, "The word `" + string((yyvsp[-3].id)) + "' is not a valid array index.");
@@ -2171,11 +2171,11 @@ yyreduce:
     j.v.i = -1;
     (yyval.int_l_ptr) = make_array_index(i, j);
 }
-#line 2175 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2175 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 793 "ce_expr.yy" /* yacc.c:1661  */
+#line 793 "ce_expr.yy" /* yacc.c:1646  */
     {
     if (!check_uint32((yyvsp[-5].id)))
         throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
@@ -2190,11 +2190,11 @@ yyreduce:
     k.v.i = atoi((yyvsp[-1].id));
     (yyval.int_l_ptr) = make_array_index(i, j, k);
 }
-#line 2194 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2194 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 808 "ce_expr.yy" /* yacc.c:1661  */
+#line 808 "ce_expr.yy" /* yacc.c:1646  */
     {
     if (!check_uint32((yyvsp[-5].id)))
         throw Error(malformed_expr, "The word `" + string((yyvsp[-5].id)) + "' is not a valid array index.");
@@ -2208,11 +2208,11 @@ yyreduce:
     k.v.i = -1;
     (yyval.int_l_ptr) = make_array_index(i, j, k);
 }
-#line 2212 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2212 "ce_expr.tab.cc" /* yacc.c:1646  */
     break;
 
 
-#line 2216 "ce_expr.tab.cc" /* yacc.c:1661  */
+#line 2216 "ce_expr.tab.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/ce_expr.tab.hh b/ce_expr.tab.hh
index 78a4d18..77bf6b8 100644
--- a/ce_expr.tab.hh
+++ b/ce_expr.tab.hh
@@ -40,7 +40,7 @@
 extern int ce_exprdebug;
 #endif
 /* "%code requires" blocks.  */
-#line 41 "ce_expr.yy" /* yacc.c:1915  */
+#line 41 "ce_expr.yy" /* yacc.c:1909  */
 
 
 #include "config.h"
@@ -136,7 +136,7 @@ template<class t, class T>
 rvalue *build_constant_array(vector<t> *values, DDS *dds);
 
 
-#line 140 "ce_expr.tab.hh" /* yacc.c:1915  */
+#line 140 "ce_expr.tab.hh" /* yacc.c:1909  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -168,7 +168,7 @@ rvalue *build_constant_array(vector<t> *values, DDS *dds);
 
 union YYSTYPE
 {
-#line 145 "ce_expr.yy" /* yacc.c:1915  */
+#line 145 "ce_expr.yy" /* yacc.c:1909  */
 
     bool boolean;
     int op;
@@ -201,7 +201,7 @@ union YYSTYPE
     libdap::rvalue *rval_ptr;
     libdap::rvalue_list *r_val_l_ptr;
 
-#line 205 "ce_expr.tab.hh" /* yacc.c:1915  */
+#line 205 "ce_expr.tab.hh" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/conf/libtool.m4 b/conf/libtool.m4
index 39ba996..671cde1 100644
--- a/conf/libtool.m4
+++ b/conf/libtool.m4
@@ -2470,10 +2470,13 @@ linux* | k*bsd*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/config.h.in b/config.h.in
index a805048..97f8b9b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -27,15 +27,15 @@
 /* Should a function (run-time) be used to determine the byte order? */
 #undef COMPUTE_ENDIAN_AT_RUNTIME
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
+/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for 'alloca.c' support on those systems.
    */
 #undef CRAY_STACKSEG_END
 
 /* Client version number */
 #undef CVER
 
-/* Define to 1 if using `alloca.c'. */
+/* Define to 1 if using 'alloca.c'. */
 #undef C_ALLOCA
 
 /* Should DAP4 support be enabled? */
@@ -665,10 +665,10 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
-/* Define to 1 if `decimal_point' is a member of `struct lconv'. */
+/* Define to 1 if `decimal_point' is member of `struct lconv'. */
 #undef HAVE_STRUCT_LCONV_DECIMAL_POINT
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the `symlink' function. */
@@ -795,9 +795,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -852,9 +849,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/configure b/configure
index 75bb6c0..37cfac6 100755
--- a/configure
+++ b/configure
@@ -1,22 +1,20 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libdap 3.18.1.
+# Generated by GNU Autoconf 2.63 for libdap 3.18.2.
 #
 # Report bugs to <opendap-tech at opendap.org>.
 #
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -24,15 +22,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -40,13 +46,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +57,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,6 +80,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -89,16 +96,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -110,16 +116,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -131,294 +133,7 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: opendap-tech at opendap.org about your system, including
-$0: any error possibly output before this message. Then
-$0: install a modern shell, or manually run the script
-$0: under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -432,12 +147,8 @@ else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
+# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -457,134 +168,439 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
 
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
+fi
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
 }
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+exitcode=0
+if as_func_success; then
+  :
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  exitcode=1
+  echo as_func_success failed.
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
 
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+if as_func_ret_success; then
+  :
 else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test \$exitcode = 0) || { (exit 1); exit 1; }
 
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  case $as_dir in
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
 
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
 
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
 fi
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
+  fi
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p=:
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
   shift
   cat <<_LT_EOF
 $*
@@ -766,11 +782,10 @@ as_awk_strverscmp='
   }
 '
 
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -785,14 +800,14 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='libdap'
 PACKAGE_TARNAME='libdap'
-PACKAGE_VERSION='3.18.1'
-PACKAGE_STRING='libdap 3.18.1'
+PACKAGE_VERSION='3.18.2'
+PACKAGE_STRING='libdap 3.18.2'
 PACKAGE_BUGREPORT='opendap-tech at opendap.org'
-PACKAGE_URL=''
 
 ac_unique_file="Connect.cc"
 # Factoring default headers for most tests.
@@ -1408,7 +1423,6 @@ bindir
 program_transform_name
 prefix
 exec_prefix
-PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -1523,9 +1537,8 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1570,7 +1583,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1596,7 +1610,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1800,7 +1815,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1816,7 +1832,8 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1846,17 +1863,17 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1865,7 +1882,7 @@ Try \`$0 --help' for more information"
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1873,13 +1890,15 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1902,7 +1921,8 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1916,6 +1936,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1930,9 +1952,11 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
 
 
 # Find the source files, if location was not specified.
@@ -1971,11 +1995,13 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+   { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -2001,7 +2027,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libdap 3.18.1 to adapt to many kinds of systems.
+\`configure' configures libdap 3.18.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2015,7 +2041,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -2071,7 +2097,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdap 3.18.1:";;
+     short | recursive ) echo "Configuration of libdap 3.18.2:";;
    esac
   cat <<\_ACEOF
 
@@ -2126,7 +2152,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2208,1631 +2234,849 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdap configure 3.18.1
-generated by GNU Autoconf 2.69
+libdap configure 3.18.2
+generated by GNU Autoconf 2.63
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
 
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+It was created by libdap $as_me 3.18.2, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
-} # ac_fn_cxx_try_compile
+  $ $0 $@
 
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
+_ACEOF
+exec 5>>config.log
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
 
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
 
-} # ac_fn_c_try_compile
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+_ASUNAME
 
-} # ac_fn_c_try_cpp
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  $as_echo "PATH: $as_dir"
+done
+IFS=$as_save_IFS
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
+} >&5
 
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
+cat >&5 <<_ACEOF
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## --------------------------------------- ##
-## Report this to opendap-tech at opendap.org ##
-## --------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_header_mongrel
+## ----------- ##
+## Core tests. ##
+## ----------- ##
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+_ACEOF
 
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
 
-} # ac_fn_c_try_run
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    2)
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    esac
+  done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
 
-} # ac_fn_c_check_header_compile
+    cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
 
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+    if test -n "$ac_subst_files"; then
+      cat <<\_ASBOX
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
+_ASBOX
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
 
-} # ac_fn_c_try_link
+    if test -s confdefs.h; then
+      cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
 
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+# Predefined preprocessor variables.
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-#undef $2
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test -r "$ac_site_file"; then
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file"
+  fi
+done
 
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
 
-    ac_retval=1
+ac_header_list="$ac_header_list fcntl.h"
+ac_header_list="$ac_header_list malloc.h"
+ac_header_list="$ac_header_list memory.h"
+ac_header_list="$ac_header_list stddef.h"
+ac_header_list="$ac_header_list stdlib.h"
+ac_header_list="$ac_header_list string.h"
+ac_header_list="$ac_header_list strings.h"
+ac_header_list="$ac_header_list unistd.h"
+ac_header_list="$ac_header_list pthread.h"
+ac_header_list="$ac_header_list sys/param.h"
+ac_header_list="$ac_header_list sys/time.h"
+ac_header_list="$ac_header_list netinet/in.h"
+ac_func_list="$ac_func_list btowc"
+ac_header_list="$ac_header_list langinfo.h"
+ac_func_list="$ac_func_list symlink"
+ac_header_list="$ac_header_list xlocale.h"
+ac_func_list="$ac_func_list mbsinit"
+ac_func_list="$ac_func_list mbrtowc"
+ac_func_list="$ac_func_list nl_langinfo"
+ac_func_list="$ac_func_list isblank"
+ac_func_list="$ac_func_list iswctype"
+ac_header_list="$ac_header_list wchar.h"
+ac_header_list="$ac_header_list stdint.h"
+ac_header_list="$ac_header_list features.h"
+ac_func_list="$ac_func_list wcrtomb"
+ac_func_list="$ac_func_list iswcntrl"
+ac_header_list="$ac_header_list wctype.h"
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
 
-} # ac_fn_cxx_try_cpp
 
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
 
-} # ac_fn_cxx_try_link
 
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_type
 
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (sizeof ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  eval "$4=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_member
 
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0;
-return test_array [0];
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0;
-return test_array [0];
 
-  ;
-  return 0;
-}
+
+
+
+
+
+
+
+
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+cat >>confdefs.h <<\_ACEOF
+#define DAP_PROTOCOL_VERSION "4.0"
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
-esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
 
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
-  ac_retval=1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
 
+ac_aux_dir=
+for ac_dir in conf "$srcdir"/conf; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_compute_int
-
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conf \"$srcdir\"/conf" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in conf \"$srcdir\"/conf" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdap $as_me 3.18.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
 
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ac_config_headers="$ac_config_headers config.h dods-datatypes-config.h xdr-datatypes-config.h"
 
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
-_ASUNAME
+am__api_version='1.11'
 
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
 IFS=$as_save_IFS
 
-} >&5
+rm -rf conftest.one conftest.two conftest.dir
 
-cat >&5 <<_ACEOF
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
-_ACEOF
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t "$srcdir/configure" conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&5
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+$as_echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
 
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
   esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  am_missing_run=
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
 done
+done
+IFS=$as_save_IFS
 
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-as_fn_append ac_header_list " fcntl.h"
-as_fn_append ac_header_list " malloc.h"
-as_fn_append ac_header_list " memory.h"
-as_fn_append ac_header_list " stddef.h"
-as_fn_append ac_header_list " stdlib.h"
-as_fn_append ac_header_list " string.h"
-as_fn_append ac_header_list " strings.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_header_list " pthread.h"
-as_fn_append ac_header_list " sys/param.h"
-as_fn_append ac_header_list " sys/time.h"
-as_fn_append ac_header_list " netinet/in.h"
-as_fn_append ac_func_list " btowc"
-as_fn_append ac_header_list " langinfo.h"
-as_fn_append ac_func_list " symlink"
-as_fn_append ac_header_list " xlocale.h"
-as_fn_append ac_func_list " mbsinit"
-as_fn_append ac_func_list " mbrtowc"
-as_fn_append ac_func_list " nl_langinfo"
-as_fn_append ac_func_list " isblank"
-as_fn_append ac_func_list " iswctype"
-as_fn_append ac_header_list " wchar.h"
-as_fn_append ac_header_list " stdint.h"
-as_fn_append ac_header_list " features.h"
-as_fn_append ac_func_list " wcrtomb"
-as_fn_append ac_func_list " iswcntrl"
-as_fn_append ac_header_list " wctype.h"
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
 done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-$as_echo "#define DAP_PROTOCOL_VERSION \"4.0\"" >>confdefs.h
-
-
+done
+IFS=$as_save_IFS
 
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-ac_aux_dir=
-for ac_dir in conf "$srcdir"/conf; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
   fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in conf \"$srcdir\"/conf" "$LINENO" 5
+else
+  STRIP="$ac_cv_prog_STRIP"
 fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-ac_config_headers="$ac_config_headers config.h dods-datatypes-config.h xdr-datatypes-config.h"
-
-
-
-am__api_version='1.11'
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
 IFS=$as_save_IFS
 
-rm -rf conftest.one conftest.two conftest.dir
-
 fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
+
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
+    # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3840,7 +3084,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3850,11 +3094,11 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -3874,7 +3118,9 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 fi
 
@@ -3890,7 +3136,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libdap'
- VERSION='3.18.1'
+ VERSION='3.18.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3934,7 +3180,10 @@ ac_config_commands="$ac_config_commands tests/atconfig"
 
 
 
-$as_echo "#define CNAME \"libdap\"" >>confdefs.h
+
+cat >>confdefs.h <<\_ACEOF
+#define CNAME "libdap"
+_ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3951,11 +3200,11 @@ _ACEOF
 PACKAGE_MAJOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\1@'`
 PACKAGE_MINOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\2@'`
 PACKAGE_SUBMINOR_VERSION=`echo $PACKAGE_VERSION | sed 's@^\([0-9]\)*\.\([0-9]*\)\.\([0-9]*\)$@\3@'`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Package Major Version:     $PACKAGE_MAJOR_VERSION" >&5
+{ $as_echo "$as_me:$LINENO: Package Major Version:     $PACKAGE_MAJOR_VERSION" >&5
 $as_echo "$as_me: Package Major Version:     $PACKAGE_MAJOR_VERSION" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Package Minor Version:     $PACKAGE_MINOR_VERSION" >&5
+{ $as_echo "$as_me:$LINENO: Package Minor Version:     $PACKAGE_MINOR_VERSION" >&5
 $as_echo "$as_me: Package Minor Version:     $PACKAGE_MINOR_VERSION" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Package SubMinor Version:  $PACKAGE_SUBMINOR_VERSION" >&5
+{ $as_echo "$as_me:$LINENO: Package SubMinor Version:  $PACKAGE_SUBMINOR_VERSION" >&5
 $as_echo "$as_me: Package SubMinor Version:  $PACKAGE_SUBMINOR_VERSION" >&6;}
 
 
@@ -3964,27 +3213,35 @@ $as_echo "$as_me: Package SubMinor Version:  $PACKAGE_SUBMINOR_VERSION" >&6;}
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+   { (exit 1); exit 1; }; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4000,24 +3257,28 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4036,8 +3297,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-DAPLIB_CURRENT=23
-DAPLIB_AGE=0
+DAPLIB_CURRENT=24
+DAPLIB_AGE=1
 DAPLIB_REVISION=0
 
 
@@ -4048,7 +3309,7 @@ LIBDAP_VERSION="$DAPLIB_CURRENT:$DAPLIB_REVISION:$DAPLIB_AGE"
 
 CLIENTLIB_CURRENT=7
 CLIENTLIB_AGE=1
-CLIENTLIB_REVISION=4
+CLIENTLIB_REVISION=5
 
 
 
@@ -4058,7 +3319,7 @@ CLIENTLIB_VERSION="$CLIENTLIB_CURRENT:$CLIENTLIB_REVISION:$CLIENTLIB_AGE"
 
 SERVERLIB_CURRENT=13
 SERVERLIB_AGE=6
-SERVERLIB_REVISION=4
+SERVERLIB_REVISION=5
 
 
 
@@ -4070,9 +3331,9 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -4083,24 +3344,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4122,9 +3383,9 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -4135,24 +3396,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4166,9 +3427,9 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -4179,24 +3440,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4209,7 +3470,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4220,31 +3481,48 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4260,8 +3538,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -4277,17 +3555,17 @@ do
 done
 rm -f $ac_rmfiles
 
-if { { ac_try="$ac_link_default"
+if { (ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -4304,7 +3582,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -4323,41 +3601,84 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
-$as_echo_n "checking for C++ compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+fi
+
 ac_exeext=$ac_cv_exeext
 
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4372,83 +3693,32 @@ for ac_file in conftest.exe conftest conftest.*; do
   esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+
+rm -f conftest$ac_cv_exeext
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4460,17 +3730,17 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -4483,23 +3753,31 @@ else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
+
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4513,16 +3791,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -4531,16 +3830,20 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4551,11 +3854,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4566,12 +3893,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -4582,17 +3933,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -4626,7 +4002,7 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -4654,12 +4030,12 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test "${enable_dependency_tracking+set}" = set; then
   enableval=$enable_dependency_tracking;
 fi
 
@@ -4679,9 +4055,9 @@ fi
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4789,7 +4165,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -4812,9 +4188,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4825,24 +4201,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4852,9 +4228,9 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4865,24 +4241,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4891,7 +4267,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4905,9 +4281,9 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4918,24 +4294,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4945,9 +4321,9 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4959,18 +4335,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -4989,10 +4365,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5004,9 +4380,9 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -5017,24 +4393,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5048,9 +4424,9 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -5061,24 +4437,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5091,7 +4467,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5102,42 +4478,62 @@ fi
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5151,16 +4547,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -5169,16 +4586,20 @@ else
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5189,11 +4610,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5204,12 +4649,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_c_werror_flag=$ac_save_c_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5220,17 +4689,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -5247,18 +4741,23 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -5310,9 +4809,32 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -5323,19 +4845,17 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
-fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5345,9 +4865,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5455,7 +4975,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -5477,14 +4997,14 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5499,7 +5019,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5508,34 +5032,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
   break
 fi
 
@@ -5547,7 +5115,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -5558,7 +5126,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5567,40 +5139,87 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -5610,9 +5229,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5623,10 +5242,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5643,7 +5262,7 @@ case `"$ac_path_GREP" --version 2>&1` in
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -5658,24 +5277,26 @@ esac
       $ac_path_GREP_found && break 3
     done
   done
-  done
+done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5689,10 +5310,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5709,7 +5330,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5724,10 +5345,12 @@ esac
       $ac_path_EGREP_found && break 3
     done
   done
-  done
+done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5735,20 +5358,24 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Minix Amsterdam compiler" >&5
+  { $as_echo "$as_me:$LINENO: checking for Minix Amsterdam compiler" >&5
 $as_echo_n "checking for Minix Amsterdam compiler... " >&6; }
-if ${gl_cv_c_amsterdam_compiler+:} false; then :
+if test "${gl_cv_c_amsterdam_compiler+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #ifdef __ACK__
@@ -5757,7 +5384,7 @@ Amsterdam
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1; then :
+  $EGREP "Amsterdam" >/dev/null 2>&1; then
   gl_cv_c_amsterdam_compiler=yes
 else
   gl_cv_c_amsterdam_compiler=no
@@ -5766,7 +5393,7 @@ rm -f conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_c_amsterdam_compiler" >&5
 $as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
   if test -z "$AR"; then
     if test $gl_cv_c_amsterdam_compiler = yes; then
@@ -5778,9 +5405,9 @@ $as_echo "$gl_cv_c_amsterdam_compiler" >&6; }
                   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -5791,24 +5418,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5818,9 +5445,9 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -5831,24 +5458,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5857,7 +5484,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5885,9 +5512,9 @@ fi
             if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5898,24 +5525,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5925,9 +5552,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5938,24 +5565,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5964,7 +5591,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5979,18 +5606,22 @@ fi
 
 
 if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
 $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
 $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6006,63 +5637,63 @@ _ACEOF
 # existing .o file with -o, though they will create one.
 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 rm -f conftest2.*
-if { { case "(($ac_try" in
+if { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+   test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
     if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
+  { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
       rm -f conftest2.*
-      if { { case "(($ac_try" in
+      if { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); };
       then
 	# cc works too.
 	:
@@ -6079,13 +5710,15 @@ rm -f core conftest*
 
 fi
 if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
 
 fi
 
@@ -6104,12 +5737,16 @@ if test "$am_t" != yes; then
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -6124,23 +5761,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -6150,14 +5812,18 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -6167,10 +5833,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -6197,33 +5867,118 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -6234,8 +5989,139 @@ done
 
 
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
   MINIX=yes
 else
   MINIX=
@@ -6244,26 +6130,39 @@ fi
 
   if test "$MINIX" = yes; then
 
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
 
 
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
 
 
-$as_echo "#define _MINIX 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
 
 
-$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _NETBSD_SOURCE 1
+_ACEOF
 
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
@@ -6276,37 +6175,76 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_safe_to_define___extensions__=yes
 else
-  ac_cv_safe_to_define___extensions__=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
 
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
 
-  $as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define _DARWIN_C_SOURCE 1
+_ACEOF
 
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
 
-  $as_echo "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define __USE_MINGW_ANSI_STDIO 1
+_ACEOF
 
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
 
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+  { $as_echo "$as_me:$LINENO: checking whether _XOPEN_SOURCE should be defined" >&5
 $as_echo_n "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if ${ac_cv_should_define__xopen_source+:} false; then :
+if test "${ac_cv_should_define__xopen_source+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_cv_should_define__xopen_source=no
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
           #include <wchar.h>
@@ -6319,10 +6257,34 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
              #define _XOPEN_SOURCE 500
@@ -6336,17 +6298,44 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_should_define__xopen_source=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_should_define__xopen_source" >&5
 $as_echo "$ac_cv_should_define__xopen_source" >&6; }
   test $ac_cv_should_define__xopen_source = yes &&
-    $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+    cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE 500
+_ACEOF
+
 
 
 
@@ -6361,7 +6350,7 @@ $as_echo "$ac_cv_should_define__xopen_source" >&6; }
 
 
   # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
+if test "${enable_threads+set}" = set; then
   enableval=$enable_threads; gl_use_threads=$enableval
 else
   if test -n "$gl_use_threads_default"; then
@@ -6450,7 +6439,7 @@ fi
   # Code from module wctype-h:
 
 
-if test x$CC = xgcc; then :
+if test x$CC = xgcc; then
    if true; then
   COMPILER_IS_GCC_TRUE=
   COMPILER_IS_GCC_FALSE='#'
@@ -6470,13 +6459,14 @@ fi
 
 fi
 
+
 for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LEX+:} false; then :
+if test "${ac_cv_prog_LEX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
@@ -6487,24 +6477,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
 $as_echo "$LEX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6520,8 +6510,7 @@ a { ECHO; }
 b { REJECT; }
 c { yymore (); }
 d { yyless (1); }
-e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument.  */
-    yyless ((input () != 0)); }
+e { yyless (input () != 0); }
 f { unput (yytext[0]); }
 . { BEGIN INITIAL; }
 %%
@@ -6534,20 +6523,20 @@ main (void)
   return ! yylex () + ! yywrap ();
 }
 _ACEOF
-{ { ac_try="$LEX conftest.l"
+{ (ac_try="$LEX conftest.l"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
 $as_echo_n "checking lex output file root... " >&6; }
-if ${ac_cv_prog_lex_root+:} false; then :
+if test "${ac_cv_prog_lex_root+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -6556,17 +6545,19 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
 $as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+  { $as_echo "$as_me:$LINENO: checking lex library" >&5
 $as_echo_n "checking lex library... " >&6; }
-if ${ac_cv_lib_lex+:} false; then :
+if test "${ac_cv_lib_lex+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -6574,29 +6565,55 @@ else
     ac_cv_lib_lex='none needed'
     for ac_lib in '' -lfl -ll; do
       LIBS="$ac_lib $ac_save_LIBS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+      cat >conftest.$ac_ext <<_ACEOF
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lex=$ac_lib
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
     done
     LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
 $as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
 $as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
@@ -6605,25 +6622,52 @@ else
 ac_cv_prog_lex_yytext_pointer=no
 ac_save_LIBS=$LIBS
 LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  #define YYTEXT_POINTER 1
+cat >conftest.$ac_ext <<_ACEOF
+#define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_prog_lex_yytext_pointer=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
 $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define YYTEXT_POINTER 1
+_ACEOF
 
 fi
 rm -f conftest.l $LEX_OUTPUT_ROOT.c
@@ -6632,23 +6676,115 @@ fi
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+  ./ | .// | /cC/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	  if test $ac_prog = install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog = install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -6656,7 +6792,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -6666,18 +6802,18 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
@@ -6700,9 +6836,9 @@ macro_revision='1.3017'
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6710,7 +6846,7 @@ else
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
+     $as_unset ac_script || ac_script=
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -6719,10 +6855,10 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -6739,7 +6875,7 @@ case `"$ac_path_SED" --version 2>&1` in
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -6754,17 +6890,19 @@ esac
       $ac_path_SED_found && break 3
     done
   done
-  done
+done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -6782,9 +6920,9 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
+if test "${ac_cv_path_FGREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6798,10 +6936,10 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
+  for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -6818,7 +6956,7 @@ case `"$ac_path_FGREP" --version 2>&1` in
     $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    ac_count=`expr $ac_count + 1`
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
@@ -6833,10 +6971,12 @@ esac
       $ac_path_FGREP_found && break 3
     done
   done
-  done
+done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -6844,7 +6984,7 @@ fi
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
@@ -6870,7 +7010,7 @@ test -z "$GREP" && GREP=grep
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test "${with_gnu_ld+set}" = set; then
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -6879,7 +7019,7 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -6909,13 +7049,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -6946,16 +7086,18 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -6968,7 +7110,7 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -6980,9 +7122,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
+if test "${lt_cv_path_NM+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -7029,7 +7171,7 @@ else
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
@@ -7040,9 +7182,9 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -7053,24 +7195,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7084,9 +7226,9 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -7097,24 +7239,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7127,7 +7269,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7147,33 +7289,33 @@ test -z "$NM" && NM=nm
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
+if test "${lt_cv_nm_interface+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7157: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7299: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7160: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7302: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7163: output\"" >&5)
+  (eval echo "\"\$as_me:7305: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -7291,10 +7433,10 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+  { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -7308,7 +7450,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
@@ -7318,17 +7460,17 @@ xsi_shell=no
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
 $as_echo "$xsi_shell" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
 $as_echo "$lt_shell_append" >&6; }
 
 
@@ -7363,14 +7505,14 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
+if test "${lt_cv_ld_reload_flag+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
@@ -7399,9 +7541,9 @@ esac
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -7412,24 +7554,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7439,9 +7581,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -7452,24 +7594,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7478,7 +7620,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7498,9 +7640,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
+if test "${lt_cv_deplibs_check_method+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7694,7 +7836,7 @@ tpf*)
 esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
@@ -7714,9 +7856,9 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -7727,24 +7869,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7754,9 +7896,9 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -7767,24 +7909,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7793,7 +7935,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7819,9 +7961,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -7832,24 +7974,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7859,9 +8001,9 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -7872,24 +8014,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7898,7 +8040,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7918,9 +8060,9 @@ test -z "$STRIP" && STRIP=:
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -7931,24 +8073,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7958,9 +8100,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -7971,24 +8113,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7997,7 +8139,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8075,9 +8217,9 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -8193,18 +8335,18 @@ void nm_test_func(void){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -8257,11 +8399,11 @@ _LT_EOF
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -8295,10 +8437,10 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
 $as_echo "failed" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
@@ -8324,7 +8466,7 @@ fi
 
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
+if test "${enable_libtool_lock+set}" = set; then
   enableval=$enable_libtool_lock;
 fi
 
@@ -8336,11 +8478,11 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE="32"
@@ -8354,12 +8496,12 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8357 "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  echo '#line 8499 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
@@ -8393,11 +8535,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
@@ -8446,9 +8588,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
+if test "${lt_cv_cc_needs_belf+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -8457,7 +8599,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -8468,13 +8614,38 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  lt_cv_cc_needs_belf=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8482,7 +8653,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -8492,11 +8663,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
@@ -8522,9 +8693,9 @@ need_locks="$enable_libtool_lock"
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -8535,24 +8706,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8562,9 +8733,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -8575,24 +8746,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8601,7 +8772,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8614,9 +8785,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -8627,24 +8798,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8654,9 +8825,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -8667,24 +8838,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8693,7 +8864,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8706,9 +8877,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
+if test "${ac_cv_prog_LIPO+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -8719,24 +8890,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8746,9 +8917,9 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -8759,24 +8930,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8785,7 +8956,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8798,9 +8969,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
+if test "${ac_cv_prog_OTOOL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -8811,24 +8982,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8838,9 +9009,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -8851,24 +9022,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8877,7 +9048,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8890,9 +9061,9 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -8903,24 +9074,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8930,9 +9101,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -8943,24 +9114,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8969,7 +9140,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -9005,9 +9176,9 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -9032,18 +9203,22 @@ else
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9054,17 +9229,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_ld_exported_symbols_list=yes
 else
-  lt_cv_ld_exported_symbols_list=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
@@ -9101,13 +9301,62 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     ;;
   esac
 
+
 for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9130,9 +9379,9 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -9143,24 +9392,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 $as_echo "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9174,9 +9423,9 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -9187,24 +9436,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 $as_echo "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9217,7 +9466,7 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -9228,36 +9477,53 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
+{ (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9271,16 +9537,37 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_compiler_gnu=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
@@ -9289,16 +9576,20 @@ else
 fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9309,11 +9600,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CXXFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9324,12 +9639,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -9340,17 +9679,42 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 $as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
@@ -9375,9 +9739,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CXX"  am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -9485,7 +9849,7 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
@@ -9508,10 +9872,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -9526,7 +9890,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -9535,34 +9903,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
   break
 fi
 
@@ -9574,7 +9986,7 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
 $as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
@@ -9585,7 +9997,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -9594,37 +10010,81 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 _lt_caught_CXX_error=yes; }
 fi
@@ -9654,7 +10114,7 @@ fi
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test "${enable_shared+set}" = set; then
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -9685,7 +10145,7 @@ fi
 
 
   # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
+if test "${enable_static+set}" = set; then
   enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -9717,7 +10177,7 @@ fi
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
+if test "${with_pic+set}" = set; then
   withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
@@ -9733,7 +10193,7 @@ test -z "$pic_mode" && pic_mode=default
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
+if test "${enable_fast_install+set}" = set; then
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -9814,9 +10274,9 @@ if test -n "${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
+if test "${lt_cv_objdir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -9829,7 +10289,7 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
@@ -9922,9 +10382,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9975,10 +10435,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9988,9 +10448,9 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -10041,10 +10501,10 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -10125,9 +10585,9 @@ lt_prog_compiler_no_builtin_flag=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -10143,11 +10603,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10146: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10606: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10150: \$? = $ac_status" >&5
+   echo "$as_me:10610: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10160,7 +10620,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -10180,7 +10640,7 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
@@ -10452,7 +10912,7 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 $as_echo "$lt_prog_compiler_pic" >&6; }
 
 
@@ -10464,9 +10924,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -10482,11 +10942,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10485: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10945: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10489: \$? = $ac_status" >&5
+   echo "$as_me:10949: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10499,7 +10959,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -10523,9 +10983,9 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -10551,7 +11011,7 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -10566,9 +11026,9 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -10587,11 +11047,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10590: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11050: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10594: \$? = $ac_status" >&5
+   echo "$as_me:11054: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10613,7 +11073,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -10621,9 +11081,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -10642,11 +11102,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10645: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11105: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10649: \$? = $ac_status" >&5
+   echo "$as_me:11109: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10668,7 +11128,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -10677,7 +11137,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -10685,10 +11145,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -10701,7 +11161,7 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -11143,7 +11603,11 @@ _LT_EOF
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -11154,7 +11618,27 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11168,9 +11652,16 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11183,7 +11674,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -11194,7 +11689,27 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -11208,9 +11723,16 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11422,16 +11944,42 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+        cat >conftest.$ac_ext <<_ACEOF
 int foo(void) {}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -11687,7 +12235,7 @@ rm -f core conftest.err conftest.$ac_objext \
     fi
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
@@ -11724,16 +12272,16 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -11747,11 +12295,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
         else
@@ -11762,7 +12310,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
 $as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
@@ -11926,7 +12474,7 @@ esac
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
@@ -12348,7 +12896,11 @@ linux* | k*bsd*-gnu)
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -12359,13 +12911,41 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
   shlibpath_overrides_runpath=yes
 fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -12374,10 +12954,13 @@ rm -f core conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12577,7 +13160,7 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -12679,7 +13262,7 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12704,7 +13287,7 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
@@ -12749,14 +13332,18 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12774,18 +13361,43 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  ac_cv_lib_dl_dlopen=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -12798,19 +13410,33 @@ fi
     ;;
 
   *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shl_load (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shl_load
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -12819,6 +13445,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 extern "C"
 #endif
 char shl_load ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_shl_load || defined __stub___shl_load
+choke me
+#endif
+
 int
 main ()
 {
@@ -12827,32 +13460,212 @@ return shl_load ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_shl_load=yes
 else
-  ac_cv_lib_dld_shl_load=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load"
 else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_dld_shl_load=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dld_shl_load=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
+if test "${ac_cv_func_dlopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dlopen (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef dlopen
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_dlopen || defined __stub___dlopen
+choke me
+#endif
+
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_dlopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_dlopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12870,28 +13683,57 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  ac_cv_lib_dl_dlopen=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12909,28 +13751,57 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  ac_cv_lib_svld_dlopen=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12948,18 +13819,43 @@ return dld_link ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  ac_cv_lib_dld_dld_link=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -12998,9 +13894,9 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
+if test "${lt_cv_dlopen_self+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -13009,7 +13905,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13012 "configure"
+#line 13908 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13068,11 +13964,11 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -13089,14 +13985,14 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
+if test "${lt_cv_dlopen_self_static+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -13105,7 +14001,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13108 "configure"
+#line 14004 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13164,11 +14060,11 @@ int main ()
   return status;
 }
 _LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -13185,7 +14081,7 @@ rm -fr conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
@@ -13224,12 +14120,12 @@ fi
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
@@ -13238,15 +14134,15 @@ else
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
@@ -13264,12 +14160,12 @@ fi
 
 
   # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
@@ -13290,14 +14186,14 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
     fi
     ;;
   esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
@@ -13438,7 +14334,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test "${with_gnu_ld+set}" = set; then
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -13447,7 +14343,7 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -13477,13 +14373,13 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
+if test "${lt_cv_path_LD+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -13514,16 +14410,18 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -13536,7 +14434,7 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -13591,7 +14489,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     fi
 
     # PORTME: fill in a description of your system's C++ link characteristics
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
     ld_shlibs_CXX=yes
     case $host_os in
@@ -13692,7 +14590,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -13703,7 +14605,27 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -13717,9 +14639,16 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13733,7 +14662,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -13744,7 +14677,27 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -13758,9 +14711,16 @@ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpat
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -14504,7 +15464,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         ;;
     esac
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
     test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -14532,11 +15492,11 @@ private:
 };
 _LT_EOF
 
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
 
@@ -14717,7 +15677,7 @@ fi
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
@@ -15034,7 +15994,7 @@ case $host_os in
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 
@@ -15043,9 +16003,9 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
@@ -15061,11 +16021,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16024: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15068: \$? = $ac_status" >&5
+   echo "$as_me:16028: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15078,7 +16038,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
@@ -15099,9 +16059,9 @@ fi
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
@@ -15127,7 +16087,7 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
@@ -15139,9 +16099,9 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -15160,11 +16120,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16123: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15167: \$? = $ac_status" >&5
+   echo "$as_me:16127: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15186,14 +16146,14 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -15212,11 +16172,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15215: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15219: \$? = $ac_status" >&5
+   echo "$as_me:16179: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15238,7 +16198,7 @@ else
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
@@ -15247,7 +16207,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -15255,10 +16215,10 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -15268,7 +16228,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -15294,7 +16254,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
@@ -15322,16 +16282,16 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -15345,11 +16305,11 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
         else
@@ -15360,7 +16320,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
 $as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
@@ -15431,7 +16391,7 @@ esac
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 library_names_spec=
@@ -15801,7 +16761,11 @@ linux* | k*bsd*-gnu)
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -15812,13 +16776,41 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
   shlibpath_overrides_runpath=yes
 fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -15827,10 +16819,13 @@ rm -f core conftest.err conftest.$ac_objext \
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16030,7 +17025,7 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -16081,7 +17076,7 @@ fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
@@ -16106,7 +17101,7 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 $as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink ||
@@ -16167,9 +17162,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
+if test "${ac_cv_prog_YACC+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -16180,24 +17175,24 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="bison"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
 $as_echo "$YACC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16205,7 +17200,7 @@ fi
 
 bison_version=`bison --version | sed -n '/^bison.*/p' | sed 's at .* \(.*\)@\1@'`
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison 3.0" >&5
+{ $as_echo "$as_me:$LINENO: checking for bison 3.0" >&5
 $as_echo_n "checking for bison 3.0... " >&6; }
 
 # This was used to set a conditional in the d4_ce/Makefile.am to build
@@ -16216,29 +17211,35 @@ $as_echo_n "checking for bison 3.0... " >&6; }
 as_arg_v1="$bison_version"
 as_arg_v2="3.0"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    as_fn_error $? "not found" "$LINENO" 5 ;; #(
-  0) :
-      ;; #(
-  2) :
-      ;; #(
-  *) :
-     ;;
+case $? in
+1) { { $as_echo "$as_me:$LINENO: error: not found" >&5
+$as_echo "$as_me: error: not found" >&2;}
+   { (exit 1); exit 1; }; };;
+0)  ;;
+2)  ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found vesion $bison_version" >&5
+{ $as_echo "$as_me:$LINENO: result: found vesion $bison_version" >&5
 $as_echo "found vesion $bison_version" >&6; }
 
+
+
+
+
+
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -16252,17 +17253,41 @@ return 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  eval "$as_ac_Header=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Header=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
@@ -16273,13 +17298,17 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16304,39 +17333,70 @@ for ac_lib in '' dir; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_opendir=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
-
+if test "${ac_cv_search_opendir+set}" = set; then
+  :
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 $as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
+if test "${ac_cv_search_opendir+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16361,39 +17421,70 @@ for ac_lib in '' x; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_opendir=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
-
+if test "${ac_cv_search_opendir+set}" = set; then
+  :
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 $as_echo "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -16408,23 +17499,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_stdc=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -16434,14 +17550,18 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -16451,10 +17571,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -16481,31 +17605,64 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  ac_cv_header_stdc=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
+if test "${ac_cv_header_sys_wait_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -16526,18 +17683,41 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_sys_wait_h=yes
 else
-  ac_cv_header_sys_wait_h=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_sys_wait_h=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
 $as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYS_WAIT_H 1
+_ACEOF
 
 fi
 
@@ -16545,12 +17725,149 @@ fi
 
 
 
-  for ac_header in $ac_header_list
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+
+for ac_header in $ac_header_list
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -16587,3043 +17904,8550 @@ done
 
 
 
-for ac_header in uuid/uuid.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UUID_UUID_H 1
-_ACEOF
- found_uuid_uuid_h=true
-else
-  found_uuid_uuid_h=false
-fi
 
-done
 
-for ac_header in uuid.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UUID_H 1
-_ACEOF
- found_uuid_h=true
-else
-  found_uuid_h=false
-fi
 
-done
 
 
-if test $found_uuid_uuid_h = true -o $found_uuid_h = true; then :
 
-else
-  as_fn_error $? "Could not find uuid.h" "$LINENO" 5
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this sort of thing.  */
-  typedef int charset[2];
-  const charset cs = { 0, 0 };
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char tx;
-    char *t = &tx;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
 
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; } bx;
-    struct s *b = &bx; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
 
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
 
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
 
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
 
-else
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
 
-fi
 
-ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
 
 
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
 
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
 
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
+
+
+
+
+for ac_header in uuid/uuid.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <time.h>
-
-int
-main ()
-{
-struct tm tm;
-				     int *p = &tm.tm_sec;
-				     return !p;
-  ;
-  return 0;
-}
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_struct_tm=time.h
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
-  ac_cv_struct_tm=sys/time.h
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
-$as_echo_n "checking for working volatile... " >&6; }
-if ${ac_cv_c_volatile+:} false; then :
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-volatile int x;
-int * volatile y = (int *) 0;
-return !x && !y;
-  ;
-  return 0;
-}
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_volatile=yes
+ found_uuid_uuid_h=true
 else
-  ac_cv_c_volatile=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  found_uuid_uuid_h=false
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
-$as_echo "$ac_cv_c_volatile" >&6; }
-if test $ac_cv_c_volatile = no; then
 
-$as_echo "#define volatile /**/" >>confdefs.h
+done
 
-fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+for ac_header in uuid.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
+	ac_header_compiler=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
 
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-  ;
-  return 0;
-}
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
+  ac_header_preproc=no
+fi
 
-  ;
-  return 0;
-}
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
+ found_uuid_h=true
 else
-  ac_cv_c_bigendian=no
+  found_uuid_h=false
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+done
+
+
+if test $found_uuid_uuid_h = true -o $found_uuid_h = true; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: Could not find uuid.h" >&5
+$as_echo "$as_me: error: Could not find uuid.h" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
 
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
 
-  ;
-  return 0;
-}
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
 
 int
 main ()
 {
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this.  */
+  typedef int charset[2];
+  const charset cs;
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_const=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_const=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define const /**/
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_inline=$ac_kw
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
 
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
+if test "${ac_cv_type_size_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-return use_ascii (foo) == use_ebcdic (foo);
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    fi
+	ac_cv_type_size_t=yes
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
-# This is used byt eh DMR tests which must choose the correct set of baselines
-# based on word order given that DAP4 uses 'reader make right' and thus the
-# DAP4 data responses are different for different word order machines. jhrg 9/29/15
-if test $ac_cv_c_bigendian = yes; then :
-  ac_word_order=big-endian
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  ac_word_order=little-endian
-fi
-
-
-    # Ignore the errors about AC_TRY_RUN missing an argument. jhrg 5/2/95
-
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-else
-  if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int=0
-   fi
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
+  :
+else
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+#define size_t unsigned int
 _ACEOF
 
+fi
 
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
+$as_echo_n "checking for struct stat.st_blksize... " >&6; }
+if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if ${ac_cv_sizeof_char+:} false; then :
-  $as_echo_n "(cached) " >&6
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (ac_aggr.st_blksize)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_stat_st_blksize=yes
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static struct stat ac_aggr;
+if (sizeof ac_aggr.st_blksize)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_stat_st_blksize=yes
 else
-  if test "$ac_cv_type_char" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_char=0
-   fi
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_member_struct_stat_st_blksize=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
+$as_echo "$ac_cv_member_struct_stat_st_blksize" >&6; }
+if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
 _ACEOF
 
 
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
-$as_echo_n "checking size of double... " >&6; }
-if ${ac_cv_sizeof_double+:} false; then :
+fi
+
+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
 
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_time=yes
 else
-  if test "$ac_cv_type_double" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (double)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_double=0
-   fi
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_header_time=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_double" >&5
-$as_echo "$ac_cv_sizeof_double" >&6; }
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
+if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+cat >>confdefs.h <<\_ACEOF
+#define TIME_WITH_SYS_TIME 1
 _ACEOF
 
+fi
 
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
-$as_echo_n "checking size of float... " >&6; }
-if ${ac_cv_sizeof_float+:} false; then :
+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <time.h>
 
+int
+main ()
+{
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_struct_tm=time.h
 else
-  if test "$ac_cv_type_float" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (float)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_float=0
-   fi
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_struct_tm=sys/time.h
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_float" >&5
-$as_echo "$ac_cv_sizeof_float" >&6; }
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
+if test $ac_cv_struct_tm = sys/time.h; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FLOAT $ac_cv_sizeof_float
+cat >>confdefs.h <<\_ACEOF
+#define TM_IN_SYS_TIME 1
 _ACEOF
 
-
-
-    # check for C99 types, headers and functions
-    ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = xyes; then :
-  dap_inttypes_header=yes
 fi
 
-
-    # DINT32 4
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int32_t" >&5
-$as_echo_n "checking size of int32_t... " >&6; }
-if ${ac_cv_sizeof_int32_t+:} false; then :
+{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if test "${ac_cv_c_volatile+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int32_t))" "ac_cv_sizeof_int32_t"        "$ac_includes_default"; then :
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
+volatile int x;
+int * volatile y = (int *) 0;
+return !x && !y;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_volatile=yes
 else
-  if test "$ac_cv_type_int32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int32_t=0
-   fi
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_c_volatile=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int32_t" >&5
-$as_echo "$ac_cv_sizeof_int32_t" >&6; }
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
+if test $ac_cv_c_volatile = no; then
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
+cat >>confdefs.h <<\_ACEOF
+#define volatile /**/
 _ACEOF
 
+fi
 
-    # DUINT32
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint32_t" >&5
-$as_echo_n "checking size of uint32_t... " >&6; }
-if ${ac_cv_sizeof_uint32_t+:} false; then :
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint32_t))" "ac_cv_sizeof_uint32_t"        "$ac_includes_default"; then :
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
 
-else
-  if test "$ac_cv_type_uint32_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint32_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint32_t=0
-   fi
-fi
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint32_t" >&5
-$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
 
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
 
-    # DINT16 short
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int16_t" >&5
-$as_echo_n "checking size of int16_t... " >&6; }
-if ${ac_cv_sizeof_int16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int16_t))" "ac_cv_sizeof_int16_t"        "$ac_includes_default"; then :
-
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
 else
-  if test "$ac_cv_type_int16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int16_t=0
-   fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int16_t" >&5
-$as_echo "$ac_cv_sizeof_int16_t" >&6; }
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
 
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
 
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
 
-    # DUINT16 unsigned short
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint16_t" >&5
-$as_echo_n "checking size of uint16_t... " >&6; }
-if ${ac_cv_sizeof_uint16_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint16_t))" "ac_cv_sizeof_uint16_t"        "$ac_includes_default"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-else
-  if test "$ac_cv_type_uint16_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint16_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint16_t=0
-   fi
+	ac_cv_c_bigendian=no
 fi
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint16_t" >&5
-$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
 
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
 
-
-    # DBYTE 1
-    # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uint8_t" >&5
-$as_echo_n "checking size of uint8_t... " >&6; }
-if ${ac_cv_sizeof_uint8_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uint8_t))" "ac_cv_sizeof_uint8_t"        "$ac_includes_default"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-else
-  if test "$ac_cv_type_uint8_t" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (uint8_t)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_uint8_t=0
-   fi
-fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uint8_t" >&5
-$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
 
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UINT8_T $ac_cv_sizeof_uint8_t
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
 
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
-    if test x"$dap_inttypes_header" = x'yes' -a $ac_cv_sizeof_int32_t -eq 4 -a $ac_cv_sizeof_int16_t -eq 2 -a $ac_cv_sizeof_uint8_t -eq 1 -a $ac_cv_sizeof_double -eq 8; then
-        dap_use_c99_types=yes
-    fi
-     if test x"$dap_use_c99_types" = 'xyes'; then
-  USE_C99_TYPES_TRUE=
-  USE_C99_TYPES_FALSE='#'
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_bigendian=no
 else
-  USE_C99_TYPES_TRUE='#'
-  USE_C99_TYPES_FALSE=
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-    # I've separated the typedefs from the config.h header because other
-    # projects which use the DAP were getting conflicts with their includes,
-    # or the includes of still other libraries, and config.h. The
-    # config.h header is now included only by .cc and .c files and headers
-    # that need the typedefs use dods-datatypes.h.
-    # there are 2 possibilities for the definition of dods_int32, ...,
-    # types. First possibility is that the C99 types are used and
-    # dods-datatypes-static.h is copied. In that case the following
-    # definitions are not really usefull. In case the C99 types are
-    # not available, dods-datatypes-config.h.in is used to generate
-    # dods-datatypes.h.
-    # The code below makes dods-datatypes-config.h stand on its own.
-    # 8/2/2000 jhrg
-
-    # DMH: Divide into two sets of tests: one for DODS and one for XDR
-    if test x"$dap_use_c99_types" = 'xyes'; then
-        DODS_INT64=int64_t
-        DODS_UINT64=uint64_t
-        DODS_INT32=int32_t
-        DODS_UINT32=uint32_t
-        DODS_INT16=int16_t
-        DODS_UINT16=uint16_t
-        DODS_INT8=int8_t
-        DODS_BYTE=uint8_t
-    else
-        DODS_INT64="long long"
-        DODS_UINT64="unsigned long long"
-        DODS_INT16=short
-        DODS_UINT16="unsigned short"
-	DODS_INT32=int
-	DODS_UINT32="unsigned int"
-	DODS_INT8=char
-	DODS_BYTE="unsigned char"
     fi
-    DODS_FLOAT64=double
-    DODS_FLOAT32=float
-
-    # I'm using the three arg form of AC_DEFINE_UNQUOTED because autoheader
-    # needs the third argument (although I don't quite get the specifics...
-    # 2/15/2001 jhrg
-
-cat >>confdefs.h <<_ACEOF
-#define DINT64 $DODS_INT64
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DUINT64 $DODS_UINT64
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
 _ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
-
-cat >>confdefs.h <<_ACEOF
-#define DINT32 $DODS_INT32
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
 
-
-cat >>confdefs.h <<_ACEOF
-#define DUINT32 $DODS_UINT32
-_ACEOF
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+ esac
 
 
-cat >>confdefs.h <<_ACEOF
-#define DINT16 $DODS_INT16
-_ACEOF
+# This is used byt eh DMR tests which must choose the correct set of baselines
+# based on word order given that DAP4 uses 'reader make right' and thus the
+# DAP4 data responses are different for different word order machines. jhrg 9/29/15
+if test $ac_cv_c_bigendian = yes; then
+  ac_word_order=big-endian
+else
+  ac_word_order=little-endian
+fi
 
 
-cat >>confdefs.h <<_ACEOF
-#define DUINT16 $DODS_UINT16
-_ACEOF
 
+    # Ignore the errors about AC_TRY_RUN missing an argument. jhrg 5/2/95
 
-cat >>confdefs.h <<_ACEOF
-#define DFLOAT64 $DODS_FLOAT64
-_ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define DFLOAT32 $DODS_FLOAT32
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+test_array [0] = 0
 
-
-cat >>confdefs.h <<_ACEOF
-#define DINT8 $DODS_INT8
+  ;
+  return 0;
+}
 _ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define DBYTE $DODS_BYTE
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-
-    # XDR INTEGER TYPES
-    #
-    # Since DAP4 does not use XDR, there are no defines for the int8 or the
-    # 64-bit integer types used by DAP4. jhrg  6/26/12
-    #
-    # Unfortunately, there is little commonality about xdr
-
-    # First, we need to see if the xdr routines are in libc, librpc,
-    # or librpcsvc or libnsl
-    dap_xdrlib=
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing xdr_void" >&5
-$as_echo_n "checking for library containing xdr_void... " >&6; }
-if ${ac_cv_search_xdr_void+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_void ();
+$ac_includes_default
 int
 main ()
 {
-return xdr_void ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' c rpc nsl rpcsvc; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_xdr_void=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_xdr_void+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_xdr_void+:} false; then :
-
-else
-  ac_cv_search_xdr_void=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_xdr_void" >&5
-$as_echo "$ac_cv_search_xdr_void" >&6; }
-ac_res=$ac_cv_search_xdr_void
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-      dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot locate library containing xdr functions." >&5
-$as_echo "$as_me: WARNING: Cannot locate library containing xdr functions." >&2;}
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-    # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
-    if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
-    if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi
-    # I don't think this is needed for autoconf 2.61 but I have no idea about
-    # 2.59 - it doesn't seem to be hurting anything with 2.61. jhrg
-    if test "$dap_xdrlib" != "c" ; then
-       # Add to library list
-       as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_void" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_void in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_void in -l$dap_xdrlib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_void ();
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-return xdr_void ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_LIB$dap_xdrlib" | $as_tr_cpp` 1
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-  LIBS="-l$dap_xdrlib $LIBS"
-
-fi
-
-    fi
-    # Now figure out what integer functions to use
-    dap_xdrint=0
-    as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint32_t" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_uint32_t in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_uint32_t in -l$dap_xdrlib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_uint32_t ();
+$ac_includes_default
 int
 main ()
 {
-return xdr_uint32_t ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  dap_xdrint=1
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-      as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int32_t" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_u_int32_t in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_u_int32_t in -l$dap_xdrlib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_u_int32_t ();
-int
-main ()
-{
-return xdr_u_int32_t ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  eval "$as_ac_Lib=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  dap_xdrint=2
-else
 
-        as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_uint in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_uint in -l$dap_xdrlib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_uint ();
+$ac_includes_default
 int
 main ()
 {
-return xdr_uint ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  dap_xdrint=3
-else
 
-          as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_u_int in -l$dap_xdrlib" >&5
-$as_echo_n "checking for xdr_u_int in -l$dap_xdrlib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int=$ac_lo;;
+'') if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi ;;
+esac
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$dap_xdrlib  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_u_int ();
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-return xdr_u_int ();
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (int))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (int))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (int))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_int=`cat conftest.val`
 else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  dap_xdrint=4
-fi
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+( exit $ac_status )
+if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi
 fi
-
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
+rm -f conftest.val
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
-    case "$dap_xdrint" in
-    1) # uint32_t
-	XDR_INT32=xdr_int32_t
-	XDR_UINT32=xdr_uint32_t
-        XDR_INT16=xdr_int16_t
-        XDR_UINT16=xdr_uint16_t
-        ;;
-    2) # u_int32_t
-	XDR_INT32=xdr_int32_t
-	XDR_UINT32=xdr_u_int32_t
-        XDR_INT16=xdr_int16_t
-        XDR_UINT16=xdr_u_int16_t
-        ;;
-    3) # uint
-	XDR_INT32=xdr_int
-	XDR_UINT32=xdr_uint
-        XDR_INT16=xdr_short
-        XDR_UINT16=xdr_ushort
-        ;;
-    4) # u_int
-	XDR_INT32=xdr_int
-	XDR_UINT32=xdr_u_int
-        XDR_INT16=xdr_short
-        XDR_UINT16=xdr_u_short
-        ;;
-    *)
-	as_fn_error $? "Cannot determine DODS XDR integer sizes" "$LINENO" 5
-        ;;
-    esac
-    XDR_FLOAT64=xdr_double
-    XDR_FLOAT32=xdr_float
 
 
 cat >>confdefs.h <<_ACEOF
-#define XDR_INT16 $XDR_INT16
+#define SIZEOF_INT $ac_cv_sizeof_int
 _ACEOF
 
 
-cat >>confdefs.h <<_ACEOF
-#define XDR_UINT16 $XDR_UINT16
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
+test_array [0] = 0
 
-
-cat >>confdefs.h <<_ACEOF
-#define XDR_INT32 $XDR_INT32
+  ;
+  return 0;
+}
 _ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define XDR_UINT32 $XDR_UINT32
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
 
-
-cat >>confdefs.h <<_ACEOF
-#define XDR_FLOAT64 $XDR_FLOAT64
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-
-cat >>confdefs.h <<_ACEOF
-#define XDR_FLOAT32 $XDR_FLOAT32
-_ACEOF
-
-
-# Check whether --enable-runtime-endian-check was given.
-if test "${enable_runtime_endian_check+set}" = set; then :
-  enableval=$enable_runtime_endian_check;
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-if test "x$enable_runtime_endian_check" = "xyes"; then :
-
-
-$as_echo "#define COMPUTE_ENDIAN_AT_RUNTIME 1" >>confdefs.h
-
-
-fi
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+test_array [0] = 0
 
-# Checks for library functions.
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0
 
-for ac_func in alarm atexit bzero dup2 getcwd getpagesize localtime_r memmove memset pow putenv setenv strchr strerror strtol strtoul timegm mktime
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-done
-
-
-
-
-
-
-
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo= ac_hi=
+fi
 
-          LIBC_FATAL_STDERR_=1
-  export LIBC_FATAL_STDERR_
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <alloca.h>
+$ac_includes_default
 int
 main ()
 {
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi ;;
+esac
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-char *p = (char *) alloca (1);
-				    if (p) return 0;
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (long))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (long))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (long))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_long=`cat conftest.val`
 else
-  ac_cv_func_alloca_works=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (long)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-
-
-
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
+rm -f conftest.val
 fi
-rm -f conftest*
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
 cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
+#define SIZEOF_LONG $ac_cv_sizeof_long
 _ACEOF
 
-    break
-fi
-
-  done
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if test "${ac_cv_sizeof_char+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
-find_stack_direction (int *addr, int depth)
+main ()
 {
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
-}
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
-main (int argc, char **argv)
+main ()
 {
-  return find_stack_direction (0, argc + !argv + 20) < 0;
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
-  ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-
-  GNULIB_BTOWC=0;
-  GNULIB_WCTOB=0;
-  GNULIB_MBSINIT=0;
-  GNULIB_MBRTOWC=0;
-  GNULIB_MBRLEN=0;
-  GNULIB_MBSRTOWCS=0;
-  GNULIB_MBSNRTOWCS=0;
-  GNULIB_WCRTOMB=0;
-  GNULIB_WCSRTOMBS=0;
-  GNULIB_WCSNRTOMBS=0;
-  GNULIB_WCWIDTH=0;
-  GNULIB_WMEMCHR=0;
-  GNULIB_WMEMCMP=0;
-  GNULIB_WMEMCPY=0;
-  GNULIB_WMEMMOVE=0;
-  GNULIB_WMEMSET=0;
-  GNULIB_WCSLEN=0;
-  GNULIB_WCSNLEN=0;
-  GNULIB_WCSCPY=0;
-  GNULIB_WCPCPY=0;
-  GNULIB_WCSNCPY=0;
-  GNULIB_WCPNCPY=0;
-  GNULIB_WCSCAT=0;
-  GNULIB_WCSNCAT=0;
-  GNULIB_WCSCMP=0;
-  GNULIB_WCSNCMP=0;
-  GNULIB_WCSCASECMP=0;
-  GNULIB_WCSNCASECMP=0;
-  GNULIB_WCSCOLL=0;
-  GNULIB_WCSXFRM=0;
-  GNULIB_WCSDUP=0;
-  GNULIB_WCSCHR=0;
-  GNULIB_WCSRCHR=0;
-  GNULIB_WCSCSPN=0;
-  GNULIB_WCSSPN=0;
-  GNULIB_WCSPBRK=0;
-  GNULIB_WCSSTR=0;
-  GNULIB_WCSTOK=0;
-  GNULIB_WCSWIDTH=0;
-    HAVE_BTOWC=1;
-  HAVE_MBSINIT=1;
-  HAVE_MBRTOWC=1;
-  HAVE_MBRLEN=1;
-  HAVE_MBSRTOWCS=1;
-  HAVE_MBSNRTOWCS=1;
-  HAVE_WCRTOMB=1;
-  HAVE_WCSRTOMBS=1;
-  HAVE_WCSNRTOMBS=1;
-  HAVE_WMEMCHR=1;
-  HAVE_WMEMCMP=1;
-  HAVE_WMEMCPY=1;
-  HAVE_WMEMMOVE=1;
-  HAVE_WMEMSET=1;
-  HAVE_WCSLEN=1;
-  HAVE_WCSNLEN=1;
-  HAVE_WCSCPY=1;
-  HAVE_WCPCPY=1;
-  HAVE_WCSNCPY=1;
-  HAVE_WCPNCPY=1;
-  HAVE_WCSCAT=1;
-  HAVE_WCSNCAT=1;
-  HAVE_WCSCMP=1;
-  HAVE_WCSNCMP=1;
-  HAVE_WCSCASECMP=1;
-  HAVE_WCSNCASECMP=1;
-  HAVE_WCSCOLL=1;
-  HAVE_WCSXFRM=1;
-  HAVE_WCSDUP=1;
-  HAVE_WCSCHR=1;
-  HAVE_WCSRCHR=1;
-  HAVE_WCSCSPN=1;
-  HAVE_WCSSPN=1;
-  HAVE_WCSPBRK=1;
-  HAVE_WCSSTR=1;
-  HAVE_WCSTOK=1;
-  HAVE_WCSWIDTH=1;
-  HAVE_DECL_WCTOB=1;
-  HAVE_DECL_WCWIDTH=1;
-  REPLACE_MBSTATE_T=0;
-  REPLACE_BTOWC=0;
-  REPLACE_WCTOB=0;
-  REPLACE_MBSINIT=0;
-  REPLACE_MBRTOWC=0;
-  REPLACE_MBRLEN=0;
-  REPLACE_MBSRTOWCS=0;
-  REPLACE_MBSNRTOWCS=0;
-  REPLACE_WCRTOMB=0;
-  REPLACE_WCSRTOMBS=0;
-  REPLACE_WCSNRTOMBS=0;
-  REPLACE_WCWIDTH=0;
-  REPLACE_WCSWIDTH=0;
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
-$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
-if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  gl_cv_header_wchar_h_correct_inline=yes
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-       #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-extern int zero (void);
-int main () { return zero(); }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-       mv conftest.$ac_objext conftest1.$ac_objext
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
+test_array [0] = 0
 
-         #define wcstod renamed_wcstod
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-int zero (void) { return 0; }
-
+  ;
+  return 0;
+}
 _ACEOF
-       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-         mv conftest.$ac_objext conftest2.$ac_objext
-         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
-           :
-         else
-           gl_cv_header_wchar_h_correct_inline=no
-         fi
-       fi
-     fi
-     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
-$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
-  if test $gl_cv_header_wchar_h_correct_inline = no; then
-    as_fn_error $? "<wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
-This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
-C99 mode. You have four options:
-  - Add the flag -fgnu89-inline to CC and reconfigure, or
-  - Fix your include files, using parts of
-    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
-  - Use a gcc version older than 4.3, or
-  - Don't use the flags -std=c99 or -std=gnu99.
-Configuration aborted." "$LINENO" 5
-  fi
-
-
-
-
-  for ac_func in $ac_func_list
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-fi
-done
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
-$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${am_cv_langinfo_codeset+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <langinfo.h>
+$ac_includes_default
 int
 main ()
 {
-char* cs = nl_langinfo(CODESET); return !cs;
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  am_cv_langinfo_codeset=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  am_cv_langinfo_codeset=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-$as_echo "$am_cv_langinfo_codeset" >&6; }
-  if test $am_cv_langinfo_codeset = yes; then
-
-$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
-
-  fi
-
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo= ac_hi=
+fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional french locale" >&5
-$as_echo_n "checking for a traditional french locale... " >&6; }
-if ${gt_cv_locale_fr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+test_array [0] = 0
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
-     one byte long. This excludes the UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
+  ;
   return 0;
 }
-
 _ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the native Windows locale name.
-          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=French_France.1252
-          else
-            # None found.
-            gt_cv_locale_fr=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO-8859-1
-            else
-              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
-              else
-                # Test for the HP-UX locale name.
-                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_fr=fr_FR.iso88591
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_fr=fr
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr" >&5
-$as_echo "$gt_cv_locale_fr" >&6; }
-  LOCALE_FR=$gt_cv_locale_fr
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_char=$ac_lo;;
+'') if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_char=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (char)); }
+static unsigned long int ulongval () { return (long int) (sizeof (char)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (char))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (char))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (char))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_char=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+( exit $ac_status )
+if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (char)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_char=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
 
 
-  GNULIB_NL_LANGINFO=0;
-    HAVE_NL_LANGINFO=1;
-  REPLACE_NL_LANGINFO=0;
 
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
-$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of double" >&5
+$as_echo_n "checking size of double... " >&6; }
+if test "${ac_cv_sizeof_double+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  rm -rf conftestd1a conftestd1b conftestd2
-     mkdir conftestd1a conftestd1b conftestd2
-                                                  cat <<EOF > conftestd1a/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
-     cat <<EOF > conftestd1b/conftest.h
-#define DEFINED_IN_CONFTESTD1
-#include <stdio.h>
-#include_next <conftest.h>
-#ifdef DEFINED_IN_CONFTESTD2
-int foo;
-#else
-#error "include_next doesn't work"
-#endif
-EOF
-     cat <<EOF > conftestd2/conftest.h
-#ifndef DEFINED_IN_CONFTESTD1
-#error "include_next test doesn't work"
-#endif
-#define DEFINED_IN_CONFTESTD2
-EOF
-     gl_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <conftest.h>
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_have_include_next=yes
-else
-  CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <conftest.h>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_have_include_next=buggy
-else
-  gl_cv_have_include_next=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     CPPFLAGS="$gl_save_CPPFLAGS"
-     rm -rf conftestd1a conftestd1b conftestd2
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)];
+test_array [0] = 0
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
-$as_echo "$gl_cv_have_include_next" >&6; }
-  PRAGMA_SYSTEM_HEADER=
-  if test $gl_cv_have_include_next = yes; then
-    INCLUDE_NEXT=include_next
-    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-    if test -n "$GCC"; then
-      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
-    fi
-  else
-    if test $gl_cv_have_include_next = buggy; then
-      INCLUDE_NEXT=include
-      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
-    else
-      INCLUDE_NEXT=include
-      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
-    fi
-  fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
-$as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)];
+test_array [0] = 0
 
-#ifdef __TANDEM
-choke me
-#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1; then :
-  gl_cv_pragma_columns=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  gl_cv_pragma_columns=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-rm -f conftest*
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_pragma_columns" >&5
-$as_echo "$gl_cv_pragma_columns" >&6; }
-  if test $gl_cv_pragma_columns = yes; then
-    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
-  else
-    PRAGMA_COLUMNS=
-  fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_double=$ac_lo;;
+'') if test "$ac_cv_type_double" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_double=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (double)); }
+static unsigned long int ulongval () { return (long int) (sizeof (double)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (double))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (double))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (double))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_double=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+( exit $ac_status )
+if test "$ac_cv_type_double" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (double)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_double=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
+$as_echo "$ac_cv_sizeof_double" >&6; }
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
+_ACEOF
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
-$as_echo_n "checking for working fcntl.h... " >&6; }
-if ${gl_cv_header_working_fcntl_h+:} false; then :
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of float" >&5
+$as_echo_n "checking size of float... " >&6; }
+if test "${ac_cv_sizeof_float+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  gl_cv_header_working_fcntl_h=cross-compiling
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-           #include <sys/stat.h>
-           #if HAVE_UNISTD_H
-           # include <unistd.h>
-           #else /* on Windows with MSVC */
-           # include <io.h>
-           # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
-           #endif
-           #include <fcntl.h>
-           #ifndef O_NOATIME
-            #define O_NOATIME 0
-           #endif
-           #ifndef O_NOFOLLOW
-            #define O_NOFOLLOW 0
-           #endif
-           static int const constants[] =
-            {
-              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
-              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
-            };
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
+static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
+test_array [0] = 0
 
-            int result = !constants;
-            #if HAVE_SYMLINK
-            {
-              static char const sym[] = "conftest.sym";
-              if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
-              else
-                {
-                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
-                  if (fd >= 0)
-                    {
-                      close (fd);
-                      result |= 4;
-                    }
-                }
-              unlink (sym);
-            }
-            #endif
-            {
-              static char const file[] = "confdefs.h";
-              int fd = open (file, O_RDONLY | O_NOATIME);
-              if (fd < 0)
-                result |= 8;
-              else
-                {
-                  struct stat st0;
-                  if (fstat (fd, &st0) != 0)
-                    result |= 16;
-                  else
-                    {
-                      char c;
-                      sleep (1);
-                      if (read (fd, &c, 1) != 1)
-                        result |= 24;
-                      else
-                        {
-                          if (close (fd) != 0)
-                            result |= 32;
-                          else
-                            {
-                              struct stat st1;
-                              if (stat (file, &st1) != 0)
-                                result |= 40;
-                              else
-                                if (st0.st_atime != st1.st_atime)
-                                  result |= 64;
-                            }
-                        }
-                    }
-                }
-            }
-            return result;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_fcntl_h=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
-  case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
-$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
 
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOATIME $ac_val
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)];
+test_array [0] = 0
 
-
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_WORKING_O_NOFOLLOW $ac_val
+  ;
+  return 0;
+}
 _ACEOF
-
-
-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
-$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
-if ${ac_cv_gnu_library_2_1+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)];
+test_array [0] = 0
 
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky" >/dev/null 2>&1; then :
-  ac_cv_gnu_library_2_1=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  ac_cv_gnu_library_2_1=no
-fi
-rm -f conftest*
-
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
-$as_echo "$ac_cv_gnu_library_2_1" >&6; }
-
-    GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-  GNULIB_LOCALECONV=0;
-  GNULIB_SETLOCALE=0;
-  GNULIB_DUPLOCALE=0;
-    HAVE_DUPLOCALE=1;
-  REPLACE_LOCALECONV=0;
-  REPLACE_SETLOCALE=0;
-  REPLACE_DUPLOCALE=0;
-  REPLACE_STRUCT_LCONV=0;
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    REPLACE_NULL=0;
-  HAVE_MAX_ALIGN_T=1;
-  HAVE_WCHAR_T=1;
+	ac_lo= ac_hi=
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
-$as_echo_n "checking for wchar_t... " >&6; }
-if ${gt_cv_c_wchar_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';
+$ac_includes_default
 int
 main ()
 {
+static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gt_cv_c_wchar_t=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  gt_cv_c_wchar_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
-$as_echo "$gt_cv_c_wchar_t" >&6; }
-  if test $gt_cv_c_wchar_t = yes; then
-
-$as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
-
-  fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
 
-
-
-  STDDEF_H=
-  ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
-
-"
-if test "x$ac_cv_type_max_align_t" = xyes; then :
-
-else
-  HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
-fi
-
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    STDDEF_H=stddef.h
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
-$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_float=$ac_lo;;
+'') if test "$ac_cv_type_float" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_float=0
+   fi ;;
+esac
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
-      int test[2 * (sizeof NULL == sizeof (void *)) -1];
-
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (float)); }
+static unsigned long int ulongval () { return (long int) (sizeof (float)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
 
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (float))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (float))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (float))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_decl_null_works=yes
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_float=`cat conftest.val`
 else
-  gl_cv_decl_null_works=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_float" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (float)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_float=0
+   fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
-$as_echo "$gl_cv_decl_null_works" >&6; }
-  if test $gl_cv_decl_null_works = no; then
-    REPLACE_NULL=1
-    STDDEF_H=stddef.h
-  fi
-
-   if test -n "$STDDEF_H"; then
-  GL_GENERATE_STDDEF_H_TRUE=
-  GL_GENERATE_STDDEF_H_FALSE='#'
-else
-  GL_GENERATE_STDDEF_H_TRUE='#'
-  GL_GENERATE_STDDEF_H_FALSE=
+rm -f conftest.val
 fi
-
-  if test -n "$STDDEF_H"; then
-
-
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
+$as_echo "$ac_cv_sizeof_float" >&6; }
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_FLOAT $ac_cv_sizeof_float
+_ACEOF
 
 
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stddef_h='<'stddef.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
-$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+    # check for C99 types, headers and functions
+    if test "${ac_cv_header_inttypes_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${ac_cv_header_inttypes_h+set}" = set; then
   $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
+$as_echo "$ac_cv_header_inttypes_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking inttypes.h usability" >&5
+$as_echo_n "checking inttypes.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <inttypes.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking inttypes.h presence" >&5
+$as_echo_n "checking inttypes.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stddef.h>
+#include <inttypes.h>
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stddef.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
-
-        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-           gl_header=$gl_cv_absolute_stddef_h
-           gl_cv_next_stddef_h='"'$gl_header'"'
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: inttypes.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${ac_cv_header_inttypes_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_inttypes_h=$ac_header_preproc
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
-$as_echo "$gl_cv_next_stddef_h" >&6; }
-     fi
-     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
+$as_echo "$ac_cv_header_inttypes_h" >&6; }
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stddef.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stddef_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
+fi
+if test "x$ac_cv_header_inttypes_h" = x""yes; then
+  dap_inttypes_header=yes
+fi
 
 
+    # DINT32 4
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of int32_t" >&5
+$as_echo_n "checking size of int32_t... " >&6; }
+if test "${ac_cv_sizeof_int32_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
+test_array [0] = 0
 
-  fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) < 0)];
+test_array [0] = 0
 
-      if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-
-
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= $ac_mid)];
+test_array [0] = 0
 
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  with_gnu_ld=no
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
-      esac
-    fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-  IFS="$acl_save_ifs"
 else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int32_t=$ac_lo;;
+'') if test "$ac_cv_type_int32_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int32_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int32_t=0
+   fi ;;
+esac
 else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (int32_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int32_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (int32_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (int32_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (int32_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_int32_t=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_int32_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int32_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int32_t=0
+   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$acl_cv_prog_gnu_ld
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int32_t" >&5
+$as_echo "$ac_cv_sizeof_int32_t" >&6; }
+
 
 
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT32_T $ac_cv_sizeof_int32_t
+_ACEOF
 
 
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
+    # DUINT32
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of uint32_t" >&5
+$as_echo_n "checking size of uint32_t... " >&6; }
+if test "${ac_cv_sizeof_uint32_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= 0)];
+test_array [0] = 0
 
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; :
-else
-  enable_rpath=yes
-fi
-
-
-
-
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
+test_array [0] = 0
 
-#ifdef _LP64
-sixtyfour bits
-#endif
-
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-  gl_cv_solaris_64bit=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
-  gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
 
-
-  gl_threads_api=none
-  LIBTHREAD=
-  LTLIBTHREAD=
-  LIBMULTITHREAD=
-  LTLIBMULTITHREAD=
-  if test "$gl_use_threads" != no; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether imported symbols can be declared weak" >&5
-$as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
-if ${gl_cv_have_weak+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  gl_cv_have_weak=no
-              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-extern void xyzzy ();
-#pragma weak xyzzy
+$ac_includes_default
 int
 main ()
 {
-xyzzy();
+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) < 0)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_cv_have_weak=maybe
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-       if test $gl_cv_have_weak = maybe; then
-                           if test "$cross_compiling" = yes; then :
-                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __ELF__
-               Extensible Linking Format
-               #endif
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1; then :
-  gl_cv_have_weak="guessing yes"
-else
-  gl_cv_have_weak="guessing no"
-fi
-rm -f conftest*
-
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <stdio.h>
-#pragma weak fputs
-int main ()
+$ac_includes_default
+int
+main ()
 {
-  return (fputs == NULL);
+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_have_weak=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  gl_cv_have_weak=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-       fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_weak" >&5
-$as_echo "$gl_cv_have_weak" >&6; }
-    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
-      ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  gl_have_pthread_h=yes
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  gl_have_pthread_h=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-      if test "$gl_have_pthread_h" = yes; then
-        # Other possible tests:
-        #   -lpthreads (FSU threads, PCthreads)
-        #   -lgthreads
-        gl_have_pthread=
-        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
-        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
-        # the second one only in libpthread, and lock.c needs it.
-        #
-        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
-        # needs -pthread for some reason.  See:
-        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
-        save_LIBS=$LIBS
-        for gl_pthread in '' '-pthread'; do
-          LIBS="$LIBS $gl_pthread"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <pthread.h>
-                 pthread_mutex_t m;
-                 pthread_mutexattr_t ma;
-
+$ac_includes_default
 int
 main ()
 {
-pthread_mutex_lock (&m);
-                 pthread_mutexattr_init (&ma);
+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_have_pthread=yes
-             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
-             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-          LIBS=$save_LIBS
-          test -n "$gl_have_pthread" && break
-        done
 
-        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
-        # since it is defined as a macro on OSF/1.)
-        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
-          # The program links fine without libpthread. But it may actually
-          # need to link with libpthread in order to create multiple threads.
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_uint32_t=$ac_lo;;
+'') if test "$ac_cv_type_uint32_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint32_t=0
+   fi ;;
+esac
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (uint32_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (uint32_t)); }
+#include <stdio.h>
+#include <stdlib.h>
 int
 main ()
 {
-return pthread_kill ();
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (uint32_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (uint32_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (uint32_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_kill=yes
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_uint32_t=`cat conftest.val`
 else
-  ac_cv_lib_pthread_pthread_kill=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_uint32_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint32_t=0
+   fi
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
-  LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
-             # On Solaris and HP-UX, most pthread functions exist also in libc.
-             # Therefore pthread_in_use() needs to actually try to create a
-             # thread: pthread_create from libc will fail, whereas
-             # pthread_create will actually create a thread.
-             case "$host_os" in
-               solaris* | hpux*)
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint32_t" >&5
+$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
 
-$as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h
 
-             esac
 
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT32_T $ac_cv_sizeof_uint32_t
+_ACEOF
 
-        elif test -z "$gl_have_pthread"; then
-          # Some library is needed. Try libpthread and libc_r.
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
-$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+
+    # DINT16 short
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of int16_t" >&5
+$as_echo_n "checking size of int16_t... " >&6; }
+if test "${ac_cv_sizeof_int16_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= 0)];
+test_array [0] = 0
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-return pthread_kill ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_kill=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
-  ac_cv_lib_pthread_pthread_kill=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
-  gl_have_pthread=yes
-             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
-             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
 
-          if test -z "$gl_have_pthread"; then
-            # For FreeBSD 4.
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lc_r" >&5
-$as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_pthread_kill+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) < 0)];
+test_array [0] = 0
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_kill ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-return pthread_kill ();
+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_r_pthread_kill=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
 else
-  ac_cv_lib_c_r_pthread_kill=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_kill" >&5
-$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_kill" = xyes; then :
-  gl_have_pthread=yes
-               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
-               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
-fi
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-          fi
-        fi
-        if test -n "$gl_have_pthread"; then
-          gl_threads_api=posix
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
 
-$as_echo "#define USE_POSIX_THREADS 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+	ac_lo= ac_hi=
+fi
 
-$as_echo "#define USE_POSIX_THREADS_WEAK 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-              LIBTHREAD=
-              LTLIBTHREAD=
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
-        gl_have_solaristhread=
-        gl_save_LIBS="$LIBS"
-        LIBS="$LIBS -lthread"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <thread.h>
-#include <synch.h>
-
+$ac_includes_default
 int
 main ()
 {
-thr_self();
+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
+test_array [0] = 0
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_have_solaristhread=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        LIBS="$gl_save_LIBS"
-        if test -n "$gl_have_solaristhread"; then
-          gl_threads_api=solaris
-          LIBTHREAD=-lthread
-          LTLIBTHREAD=-lthread
-          LIBMULTITHREAD="$LIBTHREAD"
-          LTLIBMULTITHREAD="$LTLIBTHREAD"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-$as_echo "#define USE_SOLARIS_THREADS 1" >>confdefs.h
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
 
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int16_t=$ac_lo;;
+'') if test "$ac_cv_type_int16_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int16_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int16_t=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (int16_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int16_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-$as_echo "#define USE_SOLARIS_THREADS_WEAK 1" >>confdefs.h
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (int16_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (int16_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (int16_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
 
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      fi
-    fi
-    if test "$gl_use_threads" = pth; then
-      gl_save_CPPFLAGS="$CPPFLAGS"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_int16_t=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_int16_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (int16_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_int16_t=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int16_t" >&5
+$as_echo "$ac_cv_sizeof_int16_t" >&6; }
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT16_T $ac_cv_sizeof_int16_t
+_ACEOF
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libpth" >&5
-$as_echo_n "checking how to link with libpth... " >&6; }
-if ${ac_cv_libpth_libs+:} false; then :
+    # DUINT16 unsigned short
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of uint16_t" >&5
+$as_echo_n "checking size of uint16_t... " >&6; }
+if test "${ac_cv_sizeof_uint16_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) < 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    use_additional=yes
-
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo= ac_hi=
+fi
 
-# Check whether --with-libpth-prefix was given.
-if test "${with_libpth_prefix+set}" = set; then :
-  withval=$with_libpth_prefix;
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
+test_array [0] = 0
 
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
 
-      else
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_uint16_t=$ac_lo;;
+'') if test "$ac_cv_type_uint16_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint16_t=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (uint16_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (uint16_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (uint16_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (uint16_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (uint16_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_uint16_t=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_uint16_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint16_t=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint16_t" >&5
+$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT16_T $ac_cv_sizeof_uint16_t
+_ACEOF
+
+
+    # DBYTE 1
+    # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of uint8_t" >&5
+$as_echo_n "checking size of uint8_t... " >&6; }
+if test "${ac_cv_sizeof_uint8_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo= ac_hi=
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_uint8_t=$ac_lo;;
+'') if test "$ac_cv_type_uint8_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint8_t=0
+   fi ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+static long int longval () { return (long int) (sizeof (uint8_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (uint8_t)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (((long int) (sizeof (uint8_t))) < 0)
+    {
+      long int i = longval ();
+      if (i != ((long int) (sizeof (uint8_t))))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ((long int) (sizeof (uint8_t))))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_uint8_t=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test "$ac_cv_type_uint8_t" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }; }
+   else
+     ac_cv_sizeof_uint8_t=0
+   fi
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint8_t" >&5
+$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_UINT8_T $ac_cv_sizeof_uint8_t
+_ACEOF
+
+
+    if test x"$dap_inttypes_header" = x'yes' -a $ac_cv_sizeof_int32_t -eq 4 -a $ac_cv_sizeof_int16_t -eq 2 -a $ac_cv_sizeof_uint8_t -eq 1 -a $ac_cv_sizeof_double -eq 8; then
+        dap_use_c99_types=yes
+    fi
+     if test x"$dap_use_c99_types" = 'xyes'; then
+  USE_C99_TYPES_TRUE=
+  USE_C99_TYPES_FALSE='#'
+else
+  USE_C99_TYPES_TRUE='#'
+  USE_C99_TYPES_FALSE=
+fi
+
+
+    # I've separated the typedefs from the config.h header because other
+    # projects which use the DAP were getting conflicts with their includes,
+    # or the includes of still other libraries, and config.h. The
+    # config.h header is now included only by .cc and .c files and headers
+    # that need the typedefs use dods-datatypes.h.
+    # there are 2 possibilities for the definition of dods_int32, ...,
+    # types. First possibility is that the C99 types are used and
+    # dods-datatypes-static.h is copied. In that case the following
+    # definitions are not really usefull. In case the C99 types are
+    # not available, dods-datatypes-config.h.in is used to generate
+    # dods-datatypes.h.
+    # The code below makes dods-datatypes-config.h stand on its own.
+    # 8/2/2000 jhrg
+
+    # DMH: Divide into two sets of tests: one for DODS and one for XDR
+    if test x"$dap_use_c99_types" = 'xyes'; then
+        DODS_INT64=int64_t
+        DODS_UINT64=uint64_t
+        DODS_INT32=int32_t
+        DODS_UINT32=uint32_t
+        DODS_INT16=int16_t
+        DODS_UINT16=uint16_t
+        DODS_INT8=int8_t
+        DODS_BYTE=uint8_t
+    else
+        DODS_INT64="long long"
+        DODS_UINT64="unsigned long long"
+        DODS_INT16=short
+        DODS_UINT16="unsigned short"
+	DODS_INT32=int
+	DODS_UINT32="unsigned int"
+	DODS_INT8=char
+	DODS_BYTE="unsigned char"
+    fi
+    DODS_FLOAT64=double
+    DODS_FLOAT32=float
+
+    # I'm using the three arg form of AC_DEFINE_UNQUOTED because autoheader
+    # needs the third argument (although I don't quite get the specifics...
+    # 2/15/2001 jhrg
+
+cat >>confdefs.h <<_ACEOF
+#define DINT64 $DODS_INT64
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DUINT64 $DODS_UINT64
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DINT32 $DODS_INT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DUINT32 $DODS_UINT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DINT16 $DODS_INT16
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DUINT16 $DODS_UINT16
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DFLOAT64 $DODS_FLOAT64
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DFLOAT32 $DODS_FLOAT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DINT8 $DODS_INT8
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define DBYTE $DODS_BYTE
+_ACEOF
+
+
+    # XDR INTEGER TYPES
+    #
+    # Since DAP4 does not use XDR, there are no defines for the int8 or the
+    # 64-bit integer types used by DAP4. jhrg  6/26/12
+    #
+    # Unfortunately, there is little commonality about xdr
+
+    # First, we need to see if the xdr routines are in libc, librpc,
+    # or librpcsvc or libnsl
+    dap_xdrlib=
+    { $as_echo "$as_me:$LINENO: checking for library containing xdr_void" >&5
+$as_echo_n "checking for library containing xdr_void... " >&6; }
+if test "${ac_cv_search_xdr_void+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_void ();
+int
+main ()
+{
+return xdr_void ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' c rpc nsl rpcsvc; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_xdr_void=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_xdr_void+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_xdr_void+set}" = set; then
+  :
+else
+  ac_cv_search_xdr_void=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdr_void" >&5
+$as_echo "$ac_cv_search_xdr_void" >&6; }
+ac_res=$ac_cv_search_xdr_void
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+      dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`
+else
+
+      { $as_echo "$as_me:$LINENO: WARNING: Cannot locate library containing xdr functions." >&5
+$as_echo "$as_me: WARNING: Cannot locate library containing xdr functions." >&2;}
+fi
+
+    # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
+    if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
+    if test "$dap_xdrlib" = "none required" ; then dap_xdrlib=c; fi
+    # I don't think this is needed for autoconf 2.61 but I have no idea about
+    # 2.59 - it doesn't seem to be hurting anything with 2.61. jhrg
+    if test "$dap_xdrlib" != "c" ; then
+       # Add to library list
+
+as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_void" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for xdr_void in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_void in -l$dap_xdrlib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_void ();
+int
+main ()
+{
+return xdr_void ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_LIB$dap_xdrlib" | $as_tr_cpp` 1
+_ACEOF
+
+  LIBS="-l$dap_xdrlib $LIBS"
+
+fi
+
+    fi
+    # Now figure out what integer functions to use
+    dap_xdrint=0
+    as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint32_t" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for xdr_uint32_t in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_uint32_t in -l$dap_xdrlib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_uint32_t ();
+int
+main ()
+{
+return xdr_uint32_t ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  dap_xdrint=1
+else
+
+      as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int32_t" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for xdr_u_int32_t in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_u_int32_t in -l$dap_xdrlib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_u_int32_t ();
+int
+main ()
+{
+return xdr_u_int32_t ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  dap_xdrint=2
+else
+
+        as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_uint" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for xdr_uint in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_uint in -l$dap_xdrlib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_uint ();
+int
+main ()
+{
+return xdr_uint ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  dap_xdrint=3
+else
+
+          as_ac_Lib=`$as_echo "ac_cv_lib_$dap_xdrlib''_xdr_u_int" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for xdr_u_int in -l$dap_xdrlib" >&5
+$as_echo_n "checking for xdr_u_int in -l$dap_xdrlib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-l$dap_xdrlib  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char xdr_u_int ();
+int
+main ()
+{
+return xdr_u_int ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_Lib=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  dap_xdrint=4
+fi
+
+fi
+
+fi
+
+fi
+
+    case "$dap_xdrint" in
+    1) # uint32_t
+	XDR_INT32=xdr_int32_t
+	XDR_UINT32=xdr_uint32_t
+        XDR_INT16=xdr_int16_t
+        XDR_UINT16=xdr_uint16_t
+        ;;
+    2) # u_int32_t
+	XDR_INT32=xdr_int32_t
+	XDR_UINT32=xdr_u_int32_t
+        XDR_INT16=xdr_int16_t
+        XDR_UINT16=xdr_u_int16_t
+        ;;
+    3) # uint
+	XDR_INT32=xdr_int
+	XDR_UINT32=xdr_uint
+        XDR_INT16=xdr_short
+        XDR_UINT16=xdr_ushort
+        ;;
+    4) # u_int
+	XDR_INT32=xdr_int
+	XDR_UINT32=xdr_u_int
+        XDR_INT16=xdr_short
+        XDR_UINT16=xdr_u_short
+        ;;
+    *)
+	{ { $as_echo "$as_me:$LINENO: error: Cannot determine DODS XDR integer sizes" >&5
+$as_echo "$as_me: error: Cannot determine DODS XDR integer sizes" >&2;}
+   { (exit 1); exit 1; }; }
+        ;;
+    esac
+    XDR_FLOAT64=xdr_double
+    XDR_FLOAT32=xdr_float
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_INT16 $XDR_INT16
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_UINT16 $XDR_UINT16
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_INT32 $XDR_INT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_UINT32 $XDR_UINT32
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_FLOAT64 $XDR_FLOAT64
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define XDR_FLOAT32 $XDR_FLOAT32
+_ACEOF
+
+
+# Check whether --enable-runtime-endian-check was given.
+if test "${enable_runtime_endian_check+set}" = set; then
+  enableval=$enable_runtime_endian_check;
+fi
+
+
+if test "x$enable_runtime_endian_check" = "xyes"; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define COMPUTE_ENDIAN_AT_RUNTIME 1
+_ACEOF
+
+
+fi
+
+
+# Checks for library functions.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in alarm atexit bzero dup2 getcwd getpagesize localtime_r memmove memset pow putenv setenv strchr strerror strtol strtoul timegm mktime
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+          LIBC_FATAL_STDERR_=1
+  export LIBC_FATAL_STDERR_
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_working_alloca_h=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_alloca_works=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+
+
+
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether 'alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether 'alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction (int *addr, int depth)
+{
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
+}
+
+int
+main (int argc, char **argv)
+{
+  return find_stack_direction (0, argc + !argv + 20) < 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_stack_direction=1
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+
+  GNULIB_BTOWC=0;
+  GNULIB_WCTOB=0;
+  GNULIB_MBSINIT=0;
+  GNULIB_MBRTOWC=0;
+  GNULIB_MBRLEN=0;
+  GNULIB_MBSRTOWCS=0;
+  GNULIB_MBSNRTOWCS=0;
+  GNULIB_WCRTOMB=0;
+  GNULIB_WCSRTOMBS=0;
+  GNULIB_WCSNRTOMBS=0;
+  GNULIB_WCWIDTH=0;
+  GNULIB_WMEMCHR=0;
+  GNULIB_WMEMCMP=0;
+  GNULIB_WMEMCPY=0;
+  GNULIB_WMEMMOVE=0;
+  GNULIB_WMEMSET=0;
+  GNULIB_WCSLEN=0;
+  GNULIB_WCSNLEN=0;
+  GNULIB_WCSCPY=0;
+  GNULIB_WCPCPY=0;
+  GNULIB_WCSNCPY=0;
+  GNULIB_WCPNCPY=0;
+  GNULIB_WCSCAT=0;
+  GNULIB_WCSNCAT=0;
+  GNULIB_WCSCMP=0;
+  GNULIB_WCSNCMP=0;
+  GNULIB_WCSCASECMP=0;
+  GNULIB_WCSNCASECMP=0;
+  GNULIB_WCSCOLL=0;
+  GNULIB_WCSXFRM=0;
+  GNULIB_WCSDUP=0;
+  GNULIB_WCSCHR=0;
+  GNULIB_WCSRCHR=0;
+  GNULIB_WCSCSPN=0;
+  GNULIB_WCSSPN=0;
+  GNULIB_WCSPBRK=0;
+  GNULIB_WCSSTR=0;
+  GNULIB_WCSTOK=0;
+  GNULIB_WCSWIDTH=0;
+    HAVE_BTOWC=1;
+  HAVE_MBSINIT=1;
+  HAVE_MBRTOWC=1;
+  HAVE_MBRLEN=1;
+  HAVE_MBSRTOWCS=1;
+  HAVE_MBSNRTOWCS=1;
+  HAVE_WCRTOMB=1;
+  HAVE_WCSRTOMBS=1;
+  HAVE_WCSNRTOMBS=1;
+  HAVE_WMEMCHR=1;
+  HAVE_WMEMCMP=1;
+  HAVE_WMEMCPY=1;
+  HAVE_WMEMMOVE=1;
+  HAVE_WMEMSET=1;
+  HAVE_WCSLEN=1;
+  HAVE_WCSNLEN=1;
+  HAVE_WCSCPY=1;
+  HAVE_WCPCPY=1;
+  HAVE_WCSNCPY=1;
+  HAVE_WCPNCPY=1;
+  HAVE_WCSCAT=1;
+  HAVE_WCSNCAT=1;
+  HAVE_WCSCMP=1;
+  HAVE_WCSNCMP=1;
+  HAVE_WCSCASECMP=1;
+  HAVE_WCSNCASECMP=1;
+  HAVE_WCSCOLL=1;
+  HAVE_WCSXFRM=1;
+  HAVE_WCSDUP=1;
+  HAVE_WCSCHR=1;
+  HAVE_WCSRCHR=1;
+  HAVE_WCSCSPN=1;
+  HAVE_WCSSPN=1;
+  HAVE_WCSPBRK=1;
+  HAVE_WCSSTR=1;
+  HAVE_WCSTOK=1;
+  HAVE_WCSWIDTH=1;
+  HAVE_DECL_WCTOB=1;
+  HAVE_DECL_WCWIDTH=1;
+  REPLACE_MBSTATE_T=0;
+  REPLACE_BTOWC=0;
+  REPLACE_WCTOB=0;
+  REPLACE_MBSINIT=0;
+  REPLACE_MBRTOWC=0;
+  REPLACE_MBRLEN=0;
+  REPLACE_MBSRTOWCS=0;
+  REPLACE_MBSNRTOWCS=0;
+  REPLACE_WCRTOMB=0;
+  REPLACE_WCSRTOMBS=0;
+  REPLACE_WCSNRTOMBS=0;
+  REPLACE_WCWIDTH=0;
+  REPLACE_WCSWIDTH=0;
+
+
+            { $as_echo "$as_me:$LINENO: checking whether <wchar.h> uses 'inline' correctly" >&5
+$as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
+if test "${gl_cv_header_wchar_h_correct_inline+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_header_wchar_h_correct_inline=yes
+     cat >conftest.$ac_ext <<_ACEOF
+
+       /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define wcstod renamed_wcstod
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+extern int zero (void);
+int main () { return zero(); }
+
+_ACEOF
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+       mv conftest.$ac_objext conftest1.$ac_objext
+       cat >conftest.$ac_ext <<_ACEOF
+
+         /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define wcstod renamed_wcstod
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int zero (void) { return 0; }
+
+_ACEOF
+       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+         mv conftest.$ac_objext conftest2.$ac_objext
+         if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then
+           :
+         else
+           gl_cv_header_wchar_h_correct_inline=no
+         fi
+       fi
+     fi
+     rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_wchar_h_correct_inline" >&5
+$as_echo "$gl_cv_header_wchar_h_correct_inline" >&6; }
+  if test $gl_cv_header_wchar_h_correct_inline = no; then
+    { { $as_echo "$as_me:$LINENO: error: <wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted." >&5
+$as_echo "$as_me: error: <wchar.h> cannot be used with this compiler ($CC $CFLAGS $CPPFLAGS).
+This is a known interoperability problem of glibc <= 2.5 with gcc >= 4.3 in
+C99 mode. You have four options:
+  - Add the flag -fgnu89-inline to CC and reconfigure, or
+  - Fix your include files, using parts of
+    <http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=b037a293a48718af30d706c2e18c929d0e69a621>, or
+  - Use a gcc version older than 4.3, or
+  - Don't use the flags -std=c99 or -std=gnu99.
+Configuration aborted." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+
+
+
+
+for ac_func in $ac_func_list
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main ()
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  am_cv_langinfo_codeset=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	am_cv_langinfo_codeset=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
+  if test $am_cv_langinfo_codeset = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LANGINFO_CODESET 1
+_ACEOF
+
+  fi
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for a traditional french locale" >&5
+$as_echo_n "checking for a traditional french locale... " >&6; }
+if test "${gt_cv_locale_fr+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* Check whether the given locale name is recognized by the system.  */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+#else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+#endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.
+     On MirBSD 10, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+        || strcmp (cs, "UTF-8") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
+     one byte long. This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
+#endif
+  return 0;
+}
+
+_ACEOF
+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest$ac_exeext; then
+      case "$host_os" in
+        # Handle native Windows specially, because there setlocale() interprets
+        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "fr" or "fra" as "French" or "French_France.1252",
+        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # and similar.
+        mingw*)
+          # Test for the native Windows locale name.
+          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=French_France.1252
+          else
+            # None found.
+            gt_cv_locale_fr=none
+          fi
+          ;;
+        *)
+          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+          # configure script would override the LC_ALL setting. Likewise for
+          # LC_CTYPE, which is also set at the beginning of the configure script.
+          # Test for the usual locale name.
+          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=fr_FR
+          else
+            # Test for the locale name with explicit encoding suffix.
+            if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr=fr_FR.ISO-8859-1
+            else
+              # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr_FR.ISO8859-1
+              else
+                # Test for the HP-UX locale name.
+                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_fr=fr_FR.iso88591
+                else
+                  # Test for the Solaris 7 locale name.
+                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_fr=fr
+                  else
+                    # None found.
+                    gt_cv_locale_fr=none
+                  fi
+                fi
+              fi
+            fi
+          fi
+          ;;
+      esac
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_fr" >&5
+$as_echo "$gt_cv_locale_fr" >&6; }
+  LOCALE_FR=$gt_cv_locale_fr
+
+
+
+
+
+
+
+  GNULIB_NL_LANGINFO=0;
+    HAVE_NL_LANGINFO=1;
+  REPLACE_NL_LANGINFO=0;
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether the preprocessor supports include_next" >&5
+$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
+if test "${gl_cv_have_include_next+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  rm -rf conftestd1a conftestd1b conftestd2
+     mkdir conftestd1a conftestd1b conftestd2
+                                                  cat <<EOF > conftestd1a/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd1b/conftest.h
+#define DEFINED_IN_CONFTESTD1
+#include <stdio.h>
+#include_next <conftest.h>
+#ifdef DEFINED_IN_CONFTESTD2
+int foo;
+#else
+#error "include_next doesn't work"
+#endif
+EOF
+     cat <<EOF > conftestd2/conftest.h
+#ifndef DEFINED_IN_CONFTESTD1
+#error "include_next test doesn't work"
+#endif
+#define DEFINED_IN_CONFTESTD2
+EOF
+     gl_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+     cat >conftest.$ac_ext <<_ACEOF
+#include <conftest.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_have_include_next=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+        cat >conftest.$ac_ext <<_ACEOF
+#include <conftest.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_have_include_next=buggy
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_have_include_next=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CPPFLAGS="$gl_save_CPPFLAGS"
+     rm -rf conftestd1a conftestd1b conftestd2
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5
+$as_echo "$gl_cv_have_include_next" >&6; }
+  PRAGMA_SYSTEM_HEADER=
+  if test $gl_cv_have_include_next = yes; then
+    INCLUDE_NEXT=include_next
+    INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    if test -n "$GCC"; then
+      PRAGMA_SYSTEM_HEADER='#pragma GCC system_header'
+    fi
+  else
+    if test $gl_cv_have_include_next = buggy; then
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next
+    else
+      INCLUDE_NEXT=include
+      INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include
+    fi
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether system header files limit the line length" >&5
+$as_echo_n "checking whether system header files limit the line length... " >&6; }
+if test "${gl_cv_pragma_columns+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef __TANDEM
+choke me
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "choke me" >/dev/null 2>&1; then
+  gl_cv_pragma_columns=yes
+else
+  gl_cv_pragma_columns=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_pragma_columns" >&5
+$as_echo "$gl_cv_pragma_columns" >&6; }
+  if test $gl_cv_pragma_columns = yes; then
+    PRAGMA_COLUMNS="#pragma COLUMNS 10000"
+  else
+    PRAGMA_COLUMNS=
+  fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for working fcntl.h" >&5
+$as_echo_n "checking for working fcntl.h... " >&6; }
+if test "${gl_cv_header_working_fcntl_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  gl_cv_header_working_fcntl_h=cross-compiling
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+           #include <sys/stat.h>
+           #if HAVE_UNISTD_H
+           # include <unistd.h>
+           #else /* on Windows with MSVC */
+           # include <io.h>
+           # include <stdlib.h>
+           # defined sleep(n) _sleep ((n) * 1000)
+           #endif
+           #include <fcntl.h>
+           #ifndef O_NOATIME
+            #define O_NOATIME 0
+           #endif
+           #ifndef O_NOFOLLOW
+            #define O_NOFOLLOW 0
+           #endif
+           static int const constants[] =
+            {
+              O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
+              O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
+            };
+
+int
+main ()
+{
+
+            int result = !constants;
+            #if HAVE_SYMLINK
+            {
+              static char const sym[] = "conftest.sym";
+              if (symlink ("/dev/null", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              if (unlink (sym) != 0 || symlink (".", sym) != 0)
+                result |= 2;
+              else
+                {
+                  int fd = open (sym, O_RDONLY | O_NOFOLLOW);
+                  if (fd >= 0)
+                    {
+                      close (fd);
+                      result |= 4;
+                    }
+                }
+              unlink (sym);
+            }
+            #endif
+            {
+              static char const file[] = "confdefs.h";
+              int fd = open (file, O_RDONLY | O_NOATIME);
+              if (fd < 0)
+                result |= 8;
+              else
+                {
+                  struct stat st0;
+                  if (fstat (fd, &st0) != 0)
+                    result |= 16;
+                  else
+                    {
+                      char c;
+                      sleep (1);
+                      if (read (fd, &c, 1) != 1)
+                        result |= 24;
+                      else
+                        {
+                          if (close (fd) != 0)
+                            result |= 32;
+                          else
+                            {
+                              struct stat st1;
+                              if (stat (file, &st1) != 0)
+                                result |= 40;
+                              else
+                                if (st0.st_atime != st1.st_atime)
+                                  result |= 64;
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_header_working_fcntl_h=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+case $? in #(
+        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
+        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
+        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
+         *) gl_cv_header_working_fcntl_h='no';;
+        esac
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_working_fcntl_h" >&5
+$as_echo "$gl_cv_header_working_fcntl_h" >&6; }
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOATIME $ac_val
+_ACEOF
+
+
+  case $gl_cv_header_working_fcntl_h in #(
+  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
+  *) ac_val=1;;
+  esac
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_WORKING_O_NOFOLLOW $ac_val
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
+$as_echo_n "checking whether getc_unlocked is declared... " >&6; }
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef getc_unlocked
+  (void) getc_unlocked;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_getc_unlocked=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_getc_unlocked=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
+$as_echo "$ac_cv_have_decl_getc_unlocked" >&6; }
+if test "x$ac_cv_have_decl_getc_unlocked" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED 0
+_ACEOF
+
+
+fi
+
+
+
+    { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
+$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Lucky" >/dev/null 2>&1; then
+  ac_cv_gnu_library_2_1=yes
+else
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
+
+    GLIBC21="$ac_cv_gnu_library_2_1"
+
+
+
+  GNULIB_LOCALECONV=0;
+  GNULIB_SETLOCALE=0;
+  GNULIB_DUPLOCALE=0;
+    HAVE_DUPLOCALE=1;
+  REPLACE_LOCALECONV=0;
+  REPLACE_SETLOCALE=0;
+  REPLACE_DUPLOCALE=0;
+  REPLACE_STRUCT_LCONV=0;
+
+
+    REPLACE_NULL=0;
+  HAVE_MAX_ALIGN_T=1;
+  HAVE_WCHAR_T=1;
+
+
+  { $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
+$as_echo_n "checking for wchar_t... " >&6; }
+if test "${gt_cv_c_wchar_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+            wchar_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gt_cv_c_wchar_t=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_c_wchar_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
+$as_echo "$gt_cv_c_wchar_t" >&6; }
+  if test $gt_cv_c_wchar_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WCHAR_T 1
+_ACEOF
+
+  fi
+
+
+
+
+  STDDEF_H=
+  { $as_echo "$as_me:$LINENO: checking for max_align_t" >&5
+$as_echo_n "checking for max_align_t... " >&6; }
+if test "${ac_cv_type_max_align_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_max_align_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+
+
+int
+main ()
+{
+if (sizeof (max_align_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+
+
+int
+main ()
+{
+if (sizeof ((max_align_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_max_align_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_max_align_t" >&5
+$as_echo "$ac_cv_type_max_align_t" >&6; }
+if test "x$ac_cv_type_max_align_t" = x""yes; then
+  :
+else
+  HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
+fi
+
+  if test $gt_cv_c_wchar_t = no; then
+    HAVE_WCHAR_T=0
+    STDDEF_H=stddef.h
+  fi
+  { $as_echo "$as_me:$LINENO: checking whether NULL can be used in arbitrary expressions" >&5
+$as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
+if test "${gl_cv_decl_null_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+      int test[2 * (sizeof NULL == sizeof (void *)) -1];
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  gl_cv_decl_null_works=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_decl_null_works=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_decl_null_works" >&5
+$as_echo "$gl_cv_decl_null_works" >&6; }
+  if test $gl_cv_decl_null_works = no; then
+    REPLACE_NULL=1
+    STDDEF_H=stddef.h
+  fi
+
+   if test -n "$STDDEF_H"; then
+  GL_GENERATE_STDDEF_H_TRUE=
+  GL_GENERATE_STDDEF_H_FALSE='#'
+else
+  GL_GENERATE_STDDEF_H_TRUE='#'
+  GL_GENERATE_STDDEF_H_FALSE=
+fi
+
+  if test -n "$STDDEF_H"; then
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stddef_h='<'stddef.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stddef.h>" >&5
+$as_echo_n "checking absolute name of <stddef.h>... " >&6; }
+if test "${gl_cv_next_stddef_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+_ACEOF
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stddef.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stddef_h
+           gl_cv_next_stddef_h='"'$gl_header'"'
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stddef_h" >&5
+$as_echo "$gl_cv_next_stddef_h" >&6; }
+     fi
+     NEXT_STDDEF_H=$gl_cv_next_stddef_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stddef.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stddef_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
+
+
+
+
+  fi
+
+
+
+
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$acl_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+        test "$with_gnu_ld" != no && break
+        ;;
+      *)
+        test "$with_gnu_ld" != yes && break
+        ;;
+      esac
+    fi
+  done
+  IFS="$acl_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes
+  ;;
+*)
+  acl_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval=$enable_rpath; :
+else
+  enable_rpath=yes
+fi
+
+
+
+
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:$LINENO: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if test "${gl_cv_solaris_64bit+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then
+  gl_cv_solaris_64bit=yes
+else
+  gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+      if test -n "$searchpath"; then
+        acl_save_IFS="${IFS= 	}"; IFS=":"
+        for searchdir in $searchpath; do
+          if test -d "$searchdir"; then
+            case "$searchdir" in
+              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+  gl_threads_api=none
+  LIBTHREAD=
+  LTLIBTHREAD=
+  LIBMULTITHREAD=
+  LTLIBMULTITHREAD=
+  if test "$gl_use_threads" != no; then
+        { $as_echo "$as_me:$LINENO: checking whether imported symbols can be declared weak" >&5
+$as_echo_n "checking whether imported symbols can be declared weak... " >&6; }
+if test "${gl_cv_have_weak+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  gl_cv_have_weak=no
+              cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+extern void xyzzy ();
+#pragma weak xyzzy
+int
+main ()
+{
+xyzzy();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_cv_have_weak=maybe
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+       if test $gl_cv_have_weak = maybe; then
+                           if test "$cross_compiling" = yes; then
+                          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __ELF__
+               Extensible Linking Format
+               #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Extensible Linking Format" >/dev/null 2>&1; then
+  gl_cv_have_weak="guessing yes"
+else
+  gl_cv_have_weak="guessing no"
+fi
+rm -f conftest*
+
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdio.h>
+#pragma weak fputs
+int main ()
+{
+  return (fputs == NULL);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_have_weak=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_have_weak=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+       fi
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_have_weak" >&5
+$as_echo "$gl_cv_have_weak" >&6; }
+    if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+      # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
+      # it groks <pthread.h>. It's added above, in gl_THREADLIB_EARLY_BODY.
+      if test "${ac_cv_header_pthread_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
+if test "${ac_cv_header_pthread_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking pthread.h usability" >&5
+$as_echo_n "checking pthread.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <pthread.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking pthread.h presence" >&5
+$as_echo_n "checking pthread.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: pthread.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: pthread.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: pthread.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: pthread.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: pthread.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for pthread.h" >&5
+$as_echo_n "checking for pthread.h... " >&6; }
+if test "${ac_cv_header_pthread_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_pthread_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pthread_h" >&5
+$as_echo "$ac_cv_header_pthread_h" >&6; }
+
+fi
+if test "x$ac_cv_header_pthread_h" = x""yes; then
+  gl_have_pthread_h=yes
+else
+  gl_have_pthread_h=no
+fi
+
+
+      if test "$gl_have_pthread_h" = yes; then
+        # Other possible tests:
+        #   -lpthreads (FSU threads, PCthreads)
+        #   -lgthreads
+        gl_have_pthread=
+        # Test whether both pthread_mutex_lock and pthread_mutexattr_init exist
+        # in libc. IRIX 6.5 has the first one in both libc and libpthread, but
+        # the second one only in libpthread, and lock.c needs it.
+        #
+        # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
+        # needs -pthread for some reason.  See:
+        # http://lists.gnu.org/archive/html/bug-gnulib/2014-09/msg00023.html
+        save_LIBS=$LIBS
+        for gl_pthread in '' '-pthread'; do
+          LIBS="$LIBS $gl_pthread"
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+                 pthread_mutex_t m;
+                 pthread_mutexattr_t ma;
+
+int
+main ()
+{
+pthread_mutex_lock (&m);
+                 pthread_mutexattr_init (&ma);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_have_pthread=yes
+             LIBTHREAD=$gl_pthread LTLIBTHREAD=$gl_pthread
+             LIBMULTITHREAD=$gl_pthread LTLIBMULTITHREAD=$gl_pthread
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+          LIBS=$save_LIBS
+          test -n "$gl_have_pthread" && break
+        done
+
+        # Test for libpthread by looking for pthread_kill. (Not pthread_self,
+        # since it is defined as a macro on OSF/1.)
+        if test -n "$gl_have_pthread" && test -z "$LIBTHREAD"; then
+          # The program links fine without libpthread. But it may actually
+          # need to link with libpthread in order to create multiple threads.
+          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
+$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill ();
+int
+main ()
+{
+return pthread_kill ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_pthread_pthread_kill=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pthread_pthread_kill=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
+  LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+             # On Solaris and HP-UX, most pthread functions exist also in libc.
+             # Therefore pthread_in_use() needs to actually try to create a
+             # thread: pthread_create from libc will fail, whereas
+             # pthread_create will actually create a thread.
+             case "$host_os" in
+               solaris* | hpux*)
+
+cat >>confdefs.h <<\_ACEOF
+#define PTHREAD_IN_USE_DETECTION_HARD 1
+_ACEOF
+
+             esac
+
+fi
+
+        elif test -z "$gl_have_pthread"; then
+          # Some library is needed. Try libpthread and libc_r.
+          { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
+$as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill ();
+int
+main ()
+{
+return pthread_kill ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_pthread_pthread_kill=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pthread_pthread_kill=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
+  gl_have_pthread=yes
+             LIBTHREAD=-lpthread LTLIBTHREAD=-lpthread
+             LIBMULTITHREAD=-lpthread LTLIBMULTITHREAD=-lpthread
+fi
+
+          if test -z "$gl_have_pthread"; then
+            # For FreeBSD 4.
+            { $as_echo "$as_me:$LINENO: checking for pthread_kill in -lc_r" >&5
+$as_echo_n "checking for pthread_kill in -lc_r... " >&6; }
+if test "${ac_cv_lib_c_r_pthread_kill+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc_r  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_kill ();
+int
+main ()
+{
+return pthread_kill ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_c_r_pthread_kill=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_c_r_pthread_kill=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_kill" >&5
+$as_echo "$ac_cv_lib_c_r_pthread_kill" >&6; }
+if test "x$ac_cv_lib_c_r_pthread_kill" = x""yes; then
+  gl_have_pthread=yes
+               LIBTHREAD=-lc_r LTLIBTHREAD=-lc_r
+               LIBMULTITHREAD=-lc_r LTLIBMULTITHREAD=-lc_r
+fi
+
+          fi
+        fi
+        if test -n "$gl_have_pthread"; then
+          gl_threads_api=posix
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_POSIX_THREADS 1
+_ACEOF
+
+          if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_POSIX_THREADS_WEAK 1
+_ACEOF
+
+              LIBTHREAD=
+              LTLIBTHREAD=
+            fi
+          fi
+        fi
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      if test "$gl_use_threads" = yes || test "$gl_use_threads" = solaris; then
+        gl_have_solaristhread=
+        gl_save_LIBS="$LIBS"
+        LIBS="$LIBS -lthread"
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <thread.h>
+#include <synch.h>
+
+int
+main ()
+{
+thr_self();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_have_solaristhread=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        LIBS="$gl_save_LIBS"
+        if test -n "$gl_have_solaristhread"; then
+          gl_threads_api=solaris
+          LIBTHREAD=-lthread
+          LTLIBTHREAD=-lthread
+          LIBMULTITHREAD="$LIBTHREAD"
+          LTLIBMULTITHREAD="$LTLIBTHREAD"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SOLARIS_THREADS 1
+_ACEOF
+
+          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SOLARIS_THREADS_WEAK 1
+_ACEOF
+
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      fi
+    fi
+    if test "$gl_use_threads" = pth; then
+      gl_save_CPPFLAGS="$CPPFLAGS"
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking how to link with libpth" >&5
+$as_echo_n "checking how to link with libpth... " >&6; }
+if test "${ac_cv_libpth_libs+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-libpth-prefix was given.
+if test "${with_libpth_prefix+set}" = set; then
+  withval=$with_libpth_prefix;
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
         if test "$acl_libdirstem2" != "$acl_libdirstem" \
@@ -19635,1576 +26459,2927 @@ if test "${with_libpth_prefix+set}" = set; then :
 
 fi
 
-      LIBPTH=
-  LTLIBPTH=
-  INCPTH=
-  LIBPTH_PREFIX=
-      HAVE_LIBPTH=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='pth '
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
+      LIBPTH=
+  LTLIBPTH=
+  INCPTH=
+  LIBPTH_PREFIX=
+      HAVE_LIBPTH=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='pth '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBPTH="${LIBPTH}${LIBPTH:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBPTH; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBPTH; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
+              else
+                                                LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = 'pth'; then
+                  LIBPTH_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'pth'; then
+                  LIBPTH_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCPTH; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBPTH; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBPTH; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
+                    LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
+            LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+    ac_cv_libpth_libs="$LIBPTH"
+    ac_cv_libpth_ltlibs="$LTLIBPTH"
+    ac_cv_libpth_cppflags="$INCPTH"
+    ac_cv_libpth_prefix="$LIBPTH_PREFIX"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_libpth_libs" >&5
+$as_echo "$ac_cv_libpth_libs" >&6; }
+  LIBPTH="$ac_cv_libpth_libs"
+  LTLIBPTH="$ac_cv_libpth_ltlibs"
+  INCPTH="$ac_cv_libpth_cppflags"
+  LIBPTH_PREFIX="$ac_cv_libpth_prefix"
+
+  for element in $INCPTH; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
+
+
+
+      HAVE_LIBPTH=yes
+
+
+
+      gl_have_pth=
+      gl_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBPTH"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pth.h>
+int
+main ()
+{
+pth_self();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  gl_have_pth=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+      LIBS="$gl_save_LIBS"
+      if test -n "$gl_have_pth"; then
+        gl_threads_api=pth
+        LIBTHREAD="$LIBPTH"
+        LTLIBTHREAD="$LTLIBPTH"
+        LIBMULTITHREAD="$LIBTHREAD"
+        LTLIBMULTITHREAD="$LTLIBTHREAD"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_PTH_THREADS 1
+_ACEOF
+
+        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
+          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_PTH_THREADS_WEAK 1
+_ACEOF
+
+            LIBTHREAD=
+            LTLIBTHREAD=
+          fi
+        fi
+      else
+        CPPFLAGS="$gl_save_CPPFLAGS"
+      fi
+    fi
+    if test -z "$gl_have_pthread"; then
+      case "$gl_use_threads" in
+        yes | windows | win32) # The 'win32' is for backward compatibility.
+          if { case "$host_os" in
+                 mingw*) true;;
+                 *) false;;
+               esac
+             }; then
+            gl_threads_api=windows
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_WINDOWS_THREADS 1
+_ACEOF
+
+          fi
+          ;;
+      esac
+    fi
+  fi
+  { $as_echo "$as_me:$LINENO: checking for multithread API to use" >&5
+$as_echo_n "checking for multithread API to use... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $gl_threads_api" >&5
+$as_echo "$gl_threads_api" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+   { $as_echo "$as_me:$LINENO: checking for mbstate_t" >&5
+$as_echo_n "checking for mbstate_t... " >&6; }
+if test "${ac_cv_type_mbstate_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+int
+main ()
+{
+mbstate_t x; return sizeof x;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_mbstate_t=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_mbstate_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
+$as_echo "$ac_cv_type_mbstate_t" >&6; }
+   if test $ac_cv_type_mbstate_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MBSTATE_T 1
+_ACEOF
+
+   else
+
+cat >>confdefs.h <<\_ACEOF
+#define mbstate_t int
+_ACEOF
+
+   fi
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for a traditional japanese locale" >&5
+$as_echo_n "checking for a traditional japanese locale... " >&6; }
+if test "${gt_cv_locale_ja+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+#else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+#endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.
+     On MirBSD 10, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+        || strcmp (cs, "UTF-8") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
+     on Cygwin 1.5.x.  */
+  if (MB_CUR_MAX == 1)
+    return 1;
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding (except on MirBSD).  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  return 0;
+}
+
+_ACEOF
+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest$ac_exeext; then
+      case "$host_os" in
+        # Handle native Windows specially, because there setlocale() interprets
+        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "fr" or "fra" as "French" or "French_France.1252",
+        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # and similar.
+        mingw*)
+          # Note that on native Windows, the Japanese locale is
+          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
+          # cannot use it here.
+          gt_cv_locale_ja=none
+          ;;
+        *)
+          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+          # configure script would override the LC_ALL setting. Likewise for
+          # LC_CTYPE, which is also set at the beginning of the configure script.
+          # Test for the AIX locale name.
+          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_ja=ja_JP
+          else
+            # Test for the locale name with explicit encoding suffix.
+            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_ja=ja_JP.EUC-JP
+            else
+              # Test for the HP-UX, OSF/1, NetBSD locale name.
+              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_ja=ja_JP.eucJP
+              else
+                # Test for the IRIX, FreeBSD locale name.
+                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_ja=ja_JP.EUC
+                else
+                  # Test for the Solaris 7 locale name.
+                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_ja=ja
+                  else
+                    # Special test for NetBSD 1.6.
+                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                      gt_cv_locale_ja=ja_JP.eucJP
+                    else
+                      # None found.
+                      gt_cv_locale_ja=none
+                    fi
+                  fi
+                fi
+              fi
+            fi
+          fi
+          ;;
+      esac
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_ja" >&5
+$as_echo "$gt_cv_locale_ja" >&6; }
+  LOCALE_JA=$gt_cv_locale_ja
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for a transitional chinese locale" >&5
+$as_echo_n "checking for a transitional chinese locale... " >&6; }
+if test "${gt_cv_locale_zh_CN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main ()
+{
+  const char *p;
+  /* Check whether the given locale name is recognized by the system.  */
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+#else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+#endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.
+     On MirBSD 10, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+#if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+        || strcmp (cs, "UTF-8") == 0)
+      return 1;
+  }
+#endif
+#ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+#endif
+  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
+     This excludes the UTF-8 encoding (except on MirBSD).  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
+  for (p = buf; *p != '\0'; p++)
+    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
+      return 1;
+  /* Check whether a typical GB18030 multibyte sequence is recognized as a
+     single wide character.  This excludes the GB2312 and GBK encodings.  */
+  if (mblen ("\203\062\332\066", 5) != 4)
+    return 1;
+  return 0;
+}
+
+_ACEOF
+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest$ac_exeext; then
+      case "$host_os" in
+        # Handle native Windows specially, because there setlocale() interprets
+        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "fr" or "fra" as "French" or "French_France.1252",
+        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # and similar.
+        mingw*)
+          # Test for the hypothetical native Windows locale name.
+          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_zh_CN=Chinese_China.54936
+          else
+            # None found.
+            gt_cv_locale_zh_CN=none
+          fi
+          ;;
+        solaris2.8)
+          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
+          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
+          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
+          gt_cv_locale_zh_CN=none
+          ;;
+        *)
+          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+          # configure script would override the LC_ALL setting. Likewise for
+          # LC_CTYPE, which is also set at the beginning of the configure script.
+          # Test for the locale name without encoding suffix.
+          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_zh_CN=zh_CN
+          else
+            # Test for the locale name with explicit encoding suffix.
+            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_zh_CN=zh_CN.GB18030
+            else
+              # None found.
+              gt_cv_locale_zh_CN=none
+            fi
+          fi
+          ;;
+      esac
+    else
+      # If there was a link error, due to mblen(), the system is so old that
+      # it certainly doesn't have a chinese locale.
+      gt_cv_locale_zh_CN=none
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_zh_CN" >&5
+$as_echo "$gt_cv_locale_zh_CN" >&6; }
+  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for a french Unicode locale" >&5
+$as_echo_n "checking for a french Unicode locale... " >&6; }
+if test "${gt_cv_locale_fr_utf8+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+# else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
+    return 1;
+#endif
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
+#endif
+  return 0;
+}
+
+_ACEOF
+    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest$ac_exeext; then
+      case "$host_os" in
+        # Handle native Windows specially, because there setlocale() interprets
+        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "fr" or "fra" as "French" or "French_France.1252",
+        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # and similar.
+        mingw*)
+          # Test for the hypothetical native Windows locale name.
+          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=French_France.65001
           else
-                                    :
+            # None found.
+            gt_cv_locale_fr_utf8=none
           fi
-        else
-                              found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
+          ;;
+        *)
+          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+          # configure script would override the LC_ALL setting. Likewise for
+          # LC_CTYPE, which is also set at the beginning of the configure script.
+          # Test for the usual locale name.
+          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr_utf8=fr_FR
           else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            # Test for the locale name with explicit encoding suffix.
+            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              gt_cv_locale_fr_utf8=fr_FR.UTF-8
+            else
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=fr.UTF-8
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+                # None found.
+                gt_cv_locale_fr_utf8=none
               fi
             fi
           fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIBPTH; do
+          ;;
+      esac
+    fi
+    rm -fr conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_locale_fr_utf8" >&5
+$as_echo "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+
+
+
+  GNULIB__EXIT=0;
+  GNULIB_ATOLL=0;
+  GNULIB_CALLOC_POSIX=0;
+  GNULIB_CANONICALIZE_FILE_NAME=0;
+  GNULIB_GETLOADAVG=0;
+  GNULIB_GETSUBOPT=0;
+  GNULIB_GRANTPT=0;
+  GNULIB_MALLOC_POSIX=0;
+  GNULIB_MBTOWC=0;
+  GNULIB_MKDTEMP=0;
+  GNULIB_MKOSTEMP=0;
+  GNULIB_MKOSTEMPS=0;
+  GNULIB_MKSTEMP=0;
+  GNULIB_MKSTEMPS=0;
+  GNULIB_POSIX_OPENPT=0;
+  GNULIB_PTSNAME=0;
+  GNULIB_PTSNAME_R=0;
+  GNULIB_PUTENV=0;
+  GNULIB_QSORT_R=0;
+  GNULIB_RANDOM=0;
+  GNULIB_RANDOM_R=0;
+  GNULIB_REALLOC_POSIX=0;
+  GNULIB_REALPATH=0;
+  GNULIB_RPMATCH=0;
+  GNULIB_SECURE_GETENV=0;
+  GNULIB_SETENV=0;
+  GNULIB_STRTOD=0;
+  GNULIB_STRTOLL=0;
+  GNULIB_STRTOULL=0;
+  GNULIB_SYSTEM_POSIX=0;
+  GNULIB_UNLOCKPT=0;
+  GNULIB_UNSETENV=0;
+  GNULIB_WCTOMB=0;
+    HAVE__EXIT=1;
+  HAVE_ATOLL=1;
+  HAVE_CANONICALIZE_FILE_NAME=1;
+  HAVE_DECL_GETLOADAVG=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_GRANTPT=1;
+  HAVE_MKDTEMP=1;
+  HAVE_MKOSTEMP=1;
+  HAVE_MKOSTEMPS=1;
+  HAVE_MKSTEMP=1;
+  HAVE_MKSTEMPS=1;
+  HAVE_POSIX_OPENPT=1;
+  HAVE_PTSNAME=1;
+  HAVE_PTSNAME_R=1;
+  HAVE_RANDOM=1;
+  HAVE_RANDOM_H=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SECURE_GETENV=1;
+  HAVE_SETENV=1;
+  HAVE_DECL_SETENV=1;
+  HAVE_STRTOD=1;
+  HAVE_STRTOLL=1;
+  HAVE_STRTOULL=1;
+  HAVE_STRUCT_RANDOM_DATA=1;
+  HAVE_SYS_LOADAVG_H=0;
+  HAVE_UNLOCKPT=1;
+  HAVE_DECL_UNSETENV=1;
+  REPLACE_CALLOC=0;
+  REPLACE_CANONICALIZE_FILE_NAME=0;
+  REPLACE_MALLOC=0;
+  REPLACE_MBTOWC=0;
+  REPLACE_MKSTEMP=0;
+  REPLACE_PTSNAME=0;
+  REPLACE_PTSNAME_R=0;
+  REPLACE_PUTENV=0;
+  REPLACE_QSORT_R=0;
+  REPLACE_RANDOM_R=0;
+  REPLACE_REALLOC=0;
+  REPLACE_REALPATH=0;
+  REPLACE_SETENV=0;
+  REPLACE_STRTOD=0;
+  REPLACE_UNSETENV=0;
+  REPLACE_WCTOMB=0;
+
+
+    gl_cv_c_multiarch=no
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+         not a universal capable compiler
+        #endif
+        typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+               arch=
+     prev=
+     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
+       if test -n "$prev"; then
+         case $word in
+           i?86 | x86_64 | ppc | ppc64)
+             if test -z "$arch" || test "$arch" = "$word"; then
+               arch="$word"
+             else
+               gl_cv_c_multiarch=yes
+             fi
+             ;;
+         esac
+         prev=
+       else
+         if test "x$word" = "x-arch"; then
+           prev=arch
+         fi
+       fi
+     done
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test $gl_cv_c_multiarch = yes; then
+    APPLE_UNIVERSAL_BUILD=1
+  else
+    APPLE_UNIVERSAL_BUILD=0
+  fi
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether alarm is declared" >&5
+$as_echo_n "checking whether alarm is declared... " >&6; }
+if test "${ac_cv_have_decl_alarm+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef alarm
+  (void) alarm;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_alarm=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+	ac_cv_have_decl_alarm=no
+fi
 
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-                        LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                                LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
-              else
-                                                                                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                                if test "$acl_hardcode_direct" = yes; then
-                                                      LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                                                            LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
-                                                            haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                                                                                haveit=
-                    for x in $LDFLAGS $LIBPTH; do
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_alarm" >&5
+$as_echo "$ac_cv_have_decl_alarm" >&6; }
+if test "x$ac_cv_have_decl_alarm" = x""yes; then
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ALARM 1
+_ACEOF
 
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                                                                                        LIBPTH="${LIBPTH}${LIBPTH:+ }$found_so"
-                    else
-                                                                                                                                                                                LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                                LIBPTH="${LIBPTH}${LIBPTH:+ }$found_a"
-              else
-                                                LIBPTH="${LIBPTH}${LIBPTH:+ }-L$found_dir -l$name"
-              fi
-            fi
-                        additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'pth'; then
-                  LIBPTH_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'pth'; then
-                  LIBPTH_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INCPTH; do
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ALARM 0
+_ACEOF
 
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                                            INCPTH="${INCPTH}${INCPTH:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-                        if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-                            for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIBPTH; do
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+fi
 
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBPTH="${LIBPTH}${LIBPTH:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIBPTH; do
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+{ $as_echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if test "${ac_cv_c_restrict+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+typedef int *int_ptr;
+	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
+	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
+	   int bar (int ip[$ac_kw]) { return ip[0]; }
+
+int
+main ()
+{
+int s[1];
+	   int *$ac_kw t = s;
+	   t[0] = 0;
+	   return foo (t) + bar (t);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_restrict=$ac_kw
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                                                                  haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                                                                  haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                                        LIBPTH="${LIBPTH}${LIBPTH:+ }$dep"
-                    LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-                                                            LIBPTH="${LIBPTH}${LIBPTH:+ }-l$name"
-            LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-                        alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-            acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
-    else
-            for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIBPTH="${LIBPTH}${LIBPTH:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-            for found_dir in $ltrpathdirs; do
-      LTLIBPTH="${LTLIBPTH}${LTLIBPTH:+ }-R$found_dir"
-    done
-  fi
 
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
 
 
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) cat >>confdefs.h <<\_ACEOF
+#define restrict /**/
+_ACEOF
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
 
-    ac_cv_libpth_libs="$LIBPTH"
-    ac_cv_libpth_ltlibs="$LTLIBPTH"
-    ac_cv_libpth_cppflags="$INCPTH"
-    ac_cv_libpth_prefix="$LIBPTH_PREFIX"
 
+
+for ac_header in stdlib.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libpth_libs" >&5
-$as_echo "$ac_cv_libpth_libs" >&6; }
-  LIBPTH="$ac_cv_libpth_libs"
-  LTLIBPTH="$ac_cv_libpth_ltlibs"
-  INCPTH="$ac_cv_libpth_cppflags"
-  LIBPTH_PREFIX="$ac_cv_libpth_prefix"
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  for element in $INCPTH; do
-    haveit=
-    for x in $CPPFLAGS; do
+	ac_header_compiler=no
+fi
 
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
-    fi
-  done
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-      HAVE_LIBPTH=yes
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
-      gl_have_pth=
-      gl_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBPTH"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_malloc_0_nonnull=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <pth.h>
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
 int
 main ()
 {
-pth_self();
+return ! malloc (0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gl_have_pth=yes
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_0_nonnull=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_malloc_0_nonnull=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then
+  gl_cv_func_malloc_0_nonnull=1
+else
+  gl_cv_func_malloc_0_nonnull=0
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      LIBS="$gl_save_LIBS"
-      if test -n "$gl_have_pth"; then
-        gl_threads_api=pth
-        LIBTHREAD="$LIBPTH"
-        LTLIBTHREAD="$LTLIBPTH"
-        LIBMULTITHREAD="$LIBTHREAD"
-        LTLIBMULTITHREAD="$LTLIBTHREAD"
 
-$as_echo "#define USE_PTH_THREADS 1" >>confdefs.h
 
-        if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then
-          if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
 
-$as_echo "#define USE_PTH_THREADS_WEAK 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+_ACEOF
 
-            LIBTHREAD=
-            LTLIBTHREAD=
-          fi
-        fi
-      else
-        CPPFLAGS="$gl_save_CPPFLAGS"
-      fi
-    fi
-    if test -z "$gl_have_pthread"; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
 
-$as_echo "#define USE_WINDOWS_THREADS 1" >>confdefs.h
 
-          fi
-          ;;
-      esac
-    fi
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for multithread API to use" >&5
-$as_echo_n "checking for multithread API to use... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_threads_api" >&5
-$as_echo "$gl_threads_api" >&6; }
 
 
 
+{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+             #include <stdbool.h>
+             #ifndef bool
+              "error: bool is not defined"
+             #endif
+             #ifndef false
+              "error: false is not defined"
+             #endif
+             #if false
+              "error: false is not 0"
+             #endif
+             #ifndef true
+              "error: true is not defined"
+             #endif
+             #if true != 1
+              "error: true is not 1"
+             #endif
+             #ifndef __bool_true_false_are_defined
+              "error: __bool_true_false_are_defined is not defined"
+             #endif
 
+             struct s { _Bool s: 1; _Bool t; } s;
 
+             char a[true == 1 ? 1 : -1];
+             char b[false == 0 ? 1 : -1];
+             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+             char d[(bool) 0.5 == true ? 1 : -1];
+             /* See body of main program for 'e'.  */
+             char f[(_Bool) 0.0 == false ? 1 : -1];
+             char g[true];
+             char h[sizeof (_Bool)];
+             char i[sizeof s.t];
+             enum { j = false, k = true, l = false * true, m = true * 256 };
+             /* The following fails for
+                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+             _Bool n[m];
+             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             /* Catch a bug in an HP-UX C compiler.  See
+                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+              */
+             _Bool q = true;
+             _Bool *pq = &q;
 
+int
+main ()
+{
 
+             bool e = &s;
+             *pq |= q;
+             *pq |= ! q;
+             /* Refer to every declared value, to avoid compiler optimizations.  */
+             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+                     + !m + !n + !o + !p + !q + !pq);
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdbool_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_header_stdbool_h=no
+fi
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
-$as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+$as_echo_n "checking for _Bool... " >&6; }
+if test "${ac_cv_type__Bool+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_type__Bool=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
 int
 main ()
 {
-mbstate_t x; return sizeof x;
+if (sizeof (_Bool))
+       return 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_mbstate_t=yes
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((_Bool)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  ac_cv_type_mbstate_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
-$as_echo "$ac_cv_type_mbstate_t" >&6; }
-   if test $ac_cv_type_mbstate_t = yes; then
-
-$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-   else
+	ac_cv_type__Bool=yes
+fi
 
-$as_echo "#define mbstate_t int" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-   fi
 
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+$as_echo "$ac_cv_type__Bool" >&6; }
+if test "x$ac_cv_type__Bool" = x""yes; then
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE__BOOL 1
+_ACEOF
 
 
+fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
-$as_echo_n "checking for a traditional japanese locale... " >&6; }
-if ${gt_cv_locale_ja+:} false; then :
+  { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5
+$as_echo_n "checking for unsigned long long int... " >&6; }
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
+  ac_cv_type_unsigned_long_long_int=yes
+     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+       cat >conftest.$ac_ext <<_ACEOF
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
-{
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
-     on Cygwin 1.5.x.  */
-  if (MB_CUR_MAX == 1)
-    return 1;
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
+/* For now, do not test the preprocessor; as of 2007 there are too many
+         implementations with broken preprocessors.  Perhaps this can
+         be revisited in 2012.  In the meantime, code should not expect
+         #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                     ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                     ? 1 : -1)];
+      int i = 63;
+int
+main ()
+{
+/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+              | (llmax / ll) | (llmax % ll)
+              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+              | (ullmax / ull) | (ullmax % ull));
+  ;
   return 0;
 }
 
 _ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Note that on native Windows, the Japanese locale is
-          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
-          # cannot use it here.
-          gt_cv_locale_ja=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the AIX locale name.
-          if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.EUC-JP
-            else
-              # Test for the HP-UX, OSF/1, NetBSD locale name.
-              if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.eucJP
-              else
-                # Test for the IRIX, FreeBSD locale name.
-                if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                  gt_cv_locale_ja=ja_JP.EUC
-                else
-                  # Test for the Solaris 7 locale name.
-                  if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                    gt_cv_locale_ja=ja
-                  else
-                    # Special test for NetBSD 1.6.
-                    if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                      gt_cv_locale_ja=ja_JP.eucJP
-                    else
-                      # None found.
-                      gt_cv_locale_ja=none
-                    fi
-                  fi
-                fi
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_type_unsigned_long_long_int=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_ja" >&5
-$as_echo "$gt_cv_locale_ja" >&6; }
-  LOCALE_JA=$gt_cv_locale_ja
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+     fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
+$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+_ACEOF
 
+  fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a transitional chinese locale" >&5
-$as_echo_n "checking for a transitional chinese locale... " >&6; }
-if ${gt_cv_locale_zh_CN+:} false; then :
+  { $as_echo "$as_me:$LINENO: checking for long long int" >&5
+$as_echo_n "checking for long long int... " >&6; }
+if test "${ac_cv_type_long_long_int+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_cv_type_long_long_int=yes
+      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+        if test $ac_cv_type_long_long_int = yes; then
+                                        if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-
-#include <locale.h>
-#include <stdlib.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main ()
+#include <limits.h>
+                 #ifndef LLONG_MAX
+                 # define HALF \
+                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+                 # define LLONG_MAX (HALF - 1 + HALF)
+                 #endif
+int
+main ()
 {
-  const char *p;
-  /* Check whether the given locale name is recognized by the system.  */
-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-#else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-#endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.
-     On MirBSD 10, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
-#if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
-        || strcmp (cs, "UTF-8") == 0)
-      return 1;
-  }
-#endif
-#ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-#endif
-  /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
-     This excludes the UTF-8 encoding (except on MirBSD).  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1;
-  for (p = buf; *p != '\0'; p++)
-    if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0)
-      return 1;
-  /* Check whether a typical GB18030 multibyte sequence is recognized as a
-     single wide character.  This excludes the GB2312 and GBK encodings.  */
-  if (mblen ("\203\062\332\066", 5) != 4)
-    return 1;
+long long int n = 1;
+                 int i;
+                 for (i = 0; ; i++)
+                   {
+                     long long int m = n << i;
+                     if (m >> i != n)
+                       return 1;
+                     if (LLONG_MAX / 2 < m)
+                       break;
+                   }
+                 return 0;
+  ;
   return 0;
 }
-
 _ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=Chinese_China.54936
-          else
-            # None found.
-            gt_cv_locale_zh_CN=none
-          fi
-          ;;
-        solaris2.8)
-          # On Solaris 8, the locales zh_CN.GB18030, zh_CN.GBK, zh.GBK are
-          # broken. One witness is the test case in gl_MBRTOWC_SANITYCHECK.
-          # Another witness is that "LC_ALL=zh_CN.GB18030 bash -c true" dumps core.
-          gt_cv_locale_zh_CN=none
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the locale name without encoding suffix.
-          if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_zh_CN=zh_CN
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_zh_CN=zh_CN.GB18030
-            else
-              # None found.
-              gt_cv_locale_zh_CN=none
-            fi
-          fi
-          ;;
-      esac
-    else
-      # If there was a link error, due to mblen(), the system is so old that
-      # it certainly doesn't have a chinese locale.
-      gt_cv_locale_zh_CN=none
-    fi
-    rm -fr conftest*
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_type_long_long_int=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+        fi
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
+$as_echo "$ac_cv_type_long_long_int" >&6; }
+  if test $ac_cv_type_long_long_int = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_LONG_INT 1
+_ACEOF
+
+  fi
+
+
+
+
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_zh_CN" >&5
-$as_echo "$gt_cv_locale_zh_CN" >&6; }
-  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
 
 
 
+  if test $ac_cv_type_long_long_int = yes; then
+    HAVE_LONG_LONG_INT=1
+  else
+    HAVE_LONG_LONG_INT=0
+  fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
-$as_echo_n "checking for a french Unicode locale... " >&6; }
-if ${gt_cv_locale_fr_utf8+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    HAVE_UNSIGNED_LONG_LONG_INT=1
+  else
+    HAVE_UNSIGNED_LONG_LONG_INT=0
+  fi
 
-#include <locale.h>
-#include <time.h>
-#if HAVE_LANGINFO_CODESET
-# include <langinfo.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-struct tm t;
-char buf[16];
-int main () {
-  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
-     imitates locale dependent behaviour by looking at the environment
-     variables, and all locales use the UTF-8 encoding.  */
-#if !(defined __BEOS__ || defined __HAIKU__)
-  /* Check whether the given locale name is recognized by the system.  */
-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Windows, setlocale(category, "") looks at the system settings,
-     not at the environment variables.  Also, when an encoding suffix such
-     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
-     category of the locale to "C".  */
-  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
-      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
-    return 1;
-# else
-  if (setlocale (LC_ALL, "") == NULL) return 1;
-# endif
-  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
-     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
-     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
-     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
-     some unit tests fail.  */
-# if HAVE_LANGINFO_CODESET
-  {
-    const char *cs = nl_langinfo (CODESET);
-    if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
-      return 1;
-  }
-# endif
-# ifdef __CYGWIN__
-  /* On Cygwin, avoid locale names without encoding suffix, because the
-     locale_charset() function relies on the encoding suffix.  Note that
-     LC_ALL is set on the command line.  */
-  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
-# endif
-  /* Check whether in the abbreviation of the second month, the second
-     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
-     two bytes long, with UTF-8 encoding.  */
-  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
-  if (strftime (buf, sizeof (buf), "%b", &t) < 4
-      || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
-    return 1;
-#endif
-#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
-  /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
-  if (localeconv () ->decimal_point[0] != ',') return 1;
-#endif
-  return 0;
-}
 
-_ACEOF
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest$ac_exeext; then
-      case "$host_os" in
-        # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "fr" or "fra" as "French" or "French_France.1252",
-        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_utf8=none
-          fi
-          ;;
-        *)
-          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
-          # configure script would override the LC_ALL setting. Likewise for
-          # LC_CTYPE, which is also set at the beginning of the configure script.
-          # Test for the usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
-              else
-                # None found.
-                gt_cv_locale_fr_utf8=none
-              fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
-$as_echo "$gt_cv_locale_fr_utf8" >&6; }
-  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
 
 
 
-  GNULIB__EXIT=0;
-  GNULIB_ATOLL=0;
-  GNULIB_CALLOC_POSIX=0;
-  GNULIB_CANONICALIZE_FILE_NAME=0;
-  GNULIB_GETLOADAVG=0;
-  GNULIB_GETSUBOPT=0;
-  GNULIB_GRANTPT=0;
-  GNULIB_MALLOC_POSIX=0;
-  GNULIB_MBTOWC=0;
-  GNULIB_MKDTEMP=0;
-  GNULIB_MKOSTEMP=0;
-  GNULIB_MKOSTEMPS=0;
-  GNULIB_MKSTEMP=0;
-  GNULIB_MKSTEMPS=0;
-  GNULIB_POSIX_OPENPT=0;
-  GNULIB_PTSNAME=0;
-  GNULIB_PTSNAME_R=0;
-  GNULIB_PUTENV=0;
-  GNULIB_QSORT_R=0;
-  GNULIB_RANDOM=0;
-  GNULIB_RANDOM_R=0;
-  GNULIB_REALLOC_POSIX=0;
-  GNULIB_REALPATH=0;
-  GNULIB_RPMATCH=0;
-  GNULIB_SECURE_GETENV=0;
-  GNULIB_SETENV=0;
-  GNULIB_STRTOD=0;
-  GNULIB_STRTOLL=0;
-  GNULIB_STRTOULL=0;
-  GNULIB_SYSTEM_POSIX=0;
-  GNULIB_UNLOCKPT=0;
-  GNULIB_UNSETENV=0;
-  GNULIB_WCTOMB=0;
-    HAVE__EXIT=1;
-  HAVE_ATOLL=1;
-  HAVE_CANONICALIZE_FILE_NAME=1;
-  HAVE_DECL_GETLOADAVG=1;
-  HAVE_GETSUBOPT=1;
-  HAVE_GRANTPT=1;
-  HAVE_MKDTEMP=1;
-  HAVE_MKOSTEMP=1;
-  HAVE_MKOSTEMPS=1;
-  HAVE_MKSTEMP=1;
-  HAVE_MKSTEMPS=1;
-  HAVE_POSIX_OPENPT=1;
-  HAVE_PTSNAME=1;
-  HAVE_PTSNAME_R=1;
-  HAVE_RANDOM=1;
-  HAVE_RANDOM_H=1;
-  HAVE_RANDOM_R=1;
-  HAVE_REALPATH=1;
-  HAVE_RPMATCH=1;
-  HAVE_SECURE_GETENV=1;
-  HAVE_SETENV=1;
-  HAVE_DECL_SETENV=1;
-  HAVE_STRTOD=1;
-  HAVE_STRTOLL=1;
-  HAVE_STRTOULL=1;
-  HAVE_STRUCT_RANDOM_DATA=1;
-  HAVE_SYS_LOADAVG_H=0;
-  HAVE_UNLOCKPT=1;
-  HAVE_DECL_UNSETENV=1;
-  REPLACE_CALLOC=0;
-  REPLACE_CANONICALIZE_FILE_NAME=0;
-  REPLACE_MALLOC=0;
-  REPLACE_MBTOWC=0;
-  REPLACE_MKSTEMP=0;
-  REPLACE_PTSNAME=0;
-  REPLACE_PTSNAME_R=0;
-  REPLACE_PUTENV=0;
-  REPLACE_QSORT_R=0;
-  REPLACE_RANDOM_R=0;
-  REPLACE_REALLOC=0;
-  REPLACE_REALPATH=0;
-  REPLACE_SETENV=0;
-  REPLACE_STRTOD=0;
-  REPLACE_UNSETENV=0;
-  REPLACE_WCTOMB=0;
 
 
-    gl_cv_c_multiarch=no
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-         not a universal capable compiler
-        #endif
-        typedef int dummy;
+  if test $ac_cv_header_wchar_h = yes; then
+    HAVE_WCHAR_H=1
+  else
+    HAVE_WCHAR_H=0
+  fi
 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-               arch=
-     prev=
-     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
-       if test -n "$prev"; then
-         case $word in
-           i?86 | x86_64 | ppc | ppc64)
-             if test -z "$arch" || test "$arch" = "$word"; then
-               arch="$word"
-             else
-               gl_cv_c_multiarch=yes
-             fi
-             ;;
-         esac
-         prev=
-       else
-         if test "x$word" = "x-arch"; then
-           prev=arch
-         fi
-       fi
-     done
+      if test $ac_cv_header_inttypes_h = yes; then
+    HAVE_INTTYPES_H=1
+  else
+    HAVE_INTTYPES_H=0
+  fi
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $gl_cv_c_multiarch = yes; then
-    APPLE_UNIVERSAL_BUILD=1
+
+      if test $ac_cv_header_sys_types_h = yes; then
+    HAVE_SYS_TYPES_H=1
   else
-    APPLE_UNIVERSAL_BUILD=0
+    HAVE_SYS_TYPES_H=0
   fi
 
 
 
 
-ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
-if test "x$ac_cv_have_decl_alarm" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
-fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ALARM $ac_have_decl
-_ACEOF
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
-$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_stdint_h='<'stdint.h'>'
+     else
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stdint.h>" >&5
+$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
+if test "${gl_cv_next_stdint_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_cv_c_restrict=no
-   # The order here caters to the fact that C++ does not require restrict.
-   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-typedef int *int_ptr;
-	   int foo (int_ptr $ac_kw ip) { return ip[0]; }
-	   int bar (int [$ac_kw]); /* Catch GCC bug 14050.  */
-	   int bar (int ip[$ac_kw]) { return ip[0]; }
 
-int
-main ()
-{
-int s[1];
-	   int *$ac_kw t = s;
-	   t[0] = 0;
-	   return foo (t) + bar (t);
+             if test $ac_cv_header_stdint_h = yes; then
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_restrict=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     test "$ac_cv_c_restrict" != no && break
-   done
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-$as_echo "$ac_cv_c_restrict" >&6; }
 
- case $ac_cv_c_restrict in
-   restrict) ;;
-   no) $as_echo "#define restrict /**/" >>confdefs.h
- ;;
-   *)  cat >>confdefs.h <<_ACEOF
-#define restrict $ac_cv_c_restrict
+
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
- ;;
- esac
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdint.h>
+_ACEOF
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+
+  case "$host_os" in
+    mingw*)
+                                          gl_dirsep_regex='[/\\]'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
+  gl_header_literal_regex=`echo 'stdint.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+      s|^/[^/]|//&|
+      p
+      q
+    }'
 
+        gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+           gl_header=$gl_cv_absolute_stdint_h
+           gl_cv_next_stdint_h='"'$gl_header'"'
+          else
+               gl_cv_next_stdint_h='<'stdint.h'>'
+             fi
 
-  for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdint_h" >&5
+$as_echo "$gl_cv_next_stdint_h" >&6; }
+     fi
+     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
-done
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'stdint.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_stdint_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
+
+
+
+  if test $ac_cv_header_stdint_h = yes; then
+    HAVE_STDINT_H=1
+  else
+    HAVE_STDINT_H=0
+  fi
+
+
+    if test $ac_cv_header_stdint_h = yes; then
+    { $as_echo "$as_me:$LINENO: checking whether stdint.h conforms to C99" >&5
+$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
+if test "${gl_cv_header_working_stdint_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  gl_cv_header_working_stdint_h=no
+       cat >conftest.$ac_ext <<_ACEOF
+
+         /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
+
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
+#if !(defined WCHAR_MIN && defined WCHAR_MAX)
+#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
+#endif
+
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+
+#ifdef INT8_MAX
+int8_t a1 = INT8_MAX;
+int8_t a1min = INT8_MIN;
+#endif
+#ifdef INT16_MAX
+int16_t a2 = INT16_MAX;
+int16_t a2min = INT16_MIN;
+#endif
+#ifdef INT32_MAX
+int32_t a3 = INT32_MAX;
+int32_t a3min = INT32_MIN;
+#endif
+#ifdef INT64_MAX
+int64_t a4 = INT64_MAX;
+int64_t a4min = INT64_MIN;
+#endif
+#ifdef UINT8_MAX
+uint8_t b1 = UINT8_MAX;
 #else
-char *malloc ();
+typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
+#endif
+#ifdef UINT16_MAX
+uint16_t b2 = UINT16_MAX;
+#endif
+#ifdef UINT32_MAX
+uint32_t b3 = UINT32_MAX;
+#endif
+#ifdef UINT64_MAX
+uint64_t b4 = UINT64_MAX;
+#endif
+int_least8_t c1 = INT8_C (0x7f);
+int_least8_t c1max = INT_LEAST8_MAX;
+int_least8_t c1min = INT_LEAST8_MIN;
+int_least16_t c2 = INT16_C (0x7fff);
+int_least16_t c2max = INT_LEAST16_MAX;
+int_least16_t c2min = INT_LEAST16_MIN;
+int_least32_t c3 = INT32_C (0x7fffffff);
+int_least32_t c3max = INT_LEAST32_MAX;
+int_least32_t c3min = INT_LEAST32_MIN;
+int_least64_t c4 = INT64_C (0x7fffffffffffffff);
+int_least64_t c4max = INT_LEAST64_MAX;
+int_least64_t c4min = INT_LEAST64_MIN;
+uint_least8_t d1 = UINT8_C (0xff);
+uint_least8_t d1max = UINT_LEAST8_MAX;
+uint_least16_t d2 = UINT16_C (0xffff);
+uint_least16_t d2max = UINT_LEAST16_MAX;
+uint_least32_t d3 = UINT32_C (0xffffffff);
+uint_least32_t d3max = UINT_LEAST32_MAX;
+uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
+uint_least64_t d4max = UINT_LEAST64_MAX;
+int_fast8_t e1 = INT_FAST8_MAX;
+int_fast8_t e1min = INT_FAST8_MIN;
+int_fast16_t e2 = INT_FAST16_MAX;
+int_fast16_t e2min = INT_FAST16_MIN;
+int_fast32_t e3 = INT_FAST32_MAX;
+int_fast32_t e3min = INT_FAST32_MIN;
+int_fast64_t e4 = INT_FAST64_MAX;
+int_fast64_t e4min = INT_FAST64_MIN;
+uint_fast8_t f1 = UINT_FAST8_MAX;
+uint_fast16_t f2 = UINT_FAST16_MAX;
+uint_fast32_t f3 = UINT_FAST32_MAX;
+uint_fast64_t f4 = UINT_FAST64_MAX;
+#ifdef INTPTR_MAX
+intptr_t g = INTPTR_MAX;
+intptr_t gmin = INTPTR_MIN;
+#endif
+#ifdef UINTPTR_MAX
+uintptr_t h = UINTPTR_MAX;
+#endif
+intmax_t i = INTMAX_MAX;
+uintmax_t j = UINTMAX_MAX;
+
+#include <limits.h> /* for CHAR_BIT */
+#define TYPE_MINIMUM(t) \
+  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MAXIMUM(t) \
+  ((t) ((t) 0 < (t) -1 \
+        ? (t) -1 \
+        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+struct s {
+  int check_PTRDIFF:
+      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
+      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
+      ? 1 : -1;
+  /* Detect bug in FreeBSD 6.0 / ia64.  */
+  int check_SIG_ATOMIC:
+      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
+      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
+      ? 1 : -1;
+  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
+  int check_WCHAR:
+      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
+      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
+      ? 1 : -1;
+  /* Detect bug in mingw.  */
+  int check_WINT:
+      WINT_MIN == TYPE_MINIMUM (wint_t)
+      && WINT_MAX == TYPE_MAXIMUM (wint_t)
+      ? 1 : -1;
+
+  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
+  int check_UINT8_C:
+        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+  int check_UINT16_C:
+        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
+#ifdef UINT8_MAX
+  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
 #endif
+  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
 
 int
 main ()
 {
-return ! malloc (0);
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+                                                    if test "$cross_compiling" = yes; then
+                 gl_cv_header_working_stdint_h=yes
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-  gl_cv_func_malloc_0_nonnull=1
 else
-  gl_cv_func_malloc_0_nonnull=0
-fi
+  cat >conftest.$ac_ext <<_ACEOF
 
-
-cat >>confdefs.h <<_ACEOF
-#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull
+            /* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
 
 
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
-             #endif
-             #ifndef true
-              "error: true is not defined"
-             #endif
-             #if true != 1
-              "error: true is not 1"
-             #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
-             #endif
-
-             struct s { _Bool s: 1; _Bool t; } s;
-
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
-             /* The following fails for
-                HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-             /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-              */
-             _Bool q = true;
-             _Bool *pq = &q;
+#include <stdio.h>
+#include <string.h>
+#define MVAL(macro) MVAL1(macro)
+#define MVAL1(expression) #expression
+static const char *macro_values[] =
+  {
+#ifdef INT8_MAX
+    MVAL (INT8_MAX),
+#endif
+#ifdef INT16_MAX
+    MVAL (INT16_MAX),
+#endif
+#ifdef INT32_MAX
+    MVAL (INT32_MAX),
+#endif
+#ifdef INT64_MAX
+    MVAL (INT64_MAX),
+#endif
+#ifdef UINT8_MAX
+    MVAL (UINT8_MAX),
+#endif
+#ifdef UINT16_MAX
+    MVAL (UINT16_MAX),
+#endif
+#ifdef UINT32_MAX
+    MVAL (UINT32_MAX),
+#endif
+#ifdef UINT64_MAX
+    MVAL (UINT64_MAX),
+#endif
+    NULL
+  };
 
 int
 main ()
 {
 
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
-
-  ;
+  const char **mv;
+  for (mv = macro_values; *mv != NULL; mv++)
+    {
+      const char *value = *mv;
+      /* Test whether it looks like a cast expression.  */
+      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
+          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
+          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
+          || strncmp (value, "((int)"/*)*/, 6) == 0
+          || strncmp (value, "((signed short)"/*)*/, 15) == 0
+          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
+        return mv - macro_values + 1;
+    }
   return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdbool_h=yes
-else
-  ac_cv_header_stdbool_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
 
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
-$as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_unsigned_long_long_int=yes
-     if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-  /* For now, do not test the preprocessor; as of 2007 there are too many
-         implementations with broken preprocessors.  Perhaps this can
-         be revisited in 2012.  In the meantime, code should not expect
-         #if to work with literals wider than 32 bits.  */
-      /* Test literals.  */
-      long long int ll = 9223372036854775807ll;
-      long long int nll = -9223372036854775807LL;
-      unsigned long long int ull = 18446744073709551615ULL;
-      /* Test constant expressions.   */
-      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
-                     ? 1 : -1)];
-      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
-                     ? 1 : -1)];
-      int i = 63;
-int
-main ()
-{
-/* Test availability of runtime routines for shift and division.  */
-      long long int llmax = 9223372036854775807ll;
-      unsigned long long int ullmax = 18446744073709551615ull;
-      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-              | (llmax / ll) | (llmax % ll)
-              | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
-              | (ullmax / ull) | (ullmax % ull));
   ;
   return 0;
 }
-
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  gl_cv_header_working_stdint_h=yes
 else
-  ac_cv_type_unsigned_long_long_int=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
-$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-
-$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
-
-  fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_type_long_long_int=yes
-      if test "x${ac_cv_prog_cc_c99-no}" = xno; then
-        ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
-        if test $ac_cv_type_long_long_int = yes; then
-                                        if test "$cross_compiling" = yes; then :
-  :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-                 #ifndef LLONG_MAX
-                 # define HALF \
-                          (1LL << (sizeof (long long int) * CHAR_BIT - 2))
-                 # define LLONG_MAX (HALF - 1 + HALF)
-                 #endif
-int
-main ()
-{
-long long int n = 1;
-                 int i;
-                 for (i = 0; ; i++)
-                   {
-                     long long int m = n << i;
-                     if (m >> i != n)
-                       return 1;
-                     if (LLONG_MAX / 2 < m)
-                       break;
-                   }
-                 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-else
-  ac_cv_type_long_long_int=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
-        fi
-      fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
-$as_echo "$ac_cv_type_long_long_int" >&6; }
-  if test $ac_cv_type_long_long_int = yes; then
 
-$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+fi
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_working_stdint_h" >&5
+$as_echo "$gl_cv_header_working_stdint_h" >&6; }
   fi
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
 
 
+for ac_header in sys/inttypes.h sys/bitypes.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_header_compiler=no
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
-  if test $ac_cv_type_long_long_int = yes; then
-    HAVE_LONG_LONG_INT=1
-  else
-    HAVE_LONG_LONG_INT=0
-  fi
-
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    HAVE_UNSIGNED_LONG_LONG_INT=1
-  else
-    HAVE_UNSIGNED_LONG_LONG_INT=0
-  fi
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
-  if test $ac_cv_header_wchar_h = yes; then
-    HAVE_WCHAR_H=1
-  else
-    HAVE_WCHAR_H=0
-  fi
+    if test $ac_cv_header_sys_inttypes_h = yes; then
+      HAVE_SYS_INTTYPES_H=1
+    else
+      HAVE_SYS_INTTYPES_H=0
+    fi
 
+    if test $ac_cv_header_sys_bitypes_h = yes; then
+      HAVE_SYS_BITYPES_H=1
+    else
+      HAVE_SYS_BITYPES_H=0
+    fi
 
-      if test $ac_cv_header_inttypes_h = yes; then
-    HAVE_INTTYPES_H=1
-  else
-    HAVE_INTTYPES_H=0
-  fi
 
 
-      if test $ac_cv_header_sys_types_h = yes; then
-    HAVE_SYS_TYPES_H=1
-  else
-    HAVE_SYS_TYPES_H=0
-  fi
 
+  if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
 
 
+  for gltype in ptrdiff_t size_t ; do
+    { $as_echo "$as_me:$LINENO: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
 
-     if test $gl_cv_have_include_next = yes; then
-       gl_cv_next_stdint_h='<'stdint.h'>'
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
-$as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-if ${gl_cv_next_stdint_h+:} false; then :
-  $as_echo_n "(cached) " >&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
 else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-             if test $ac_cv_header_stdint_h = yes; then
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)];
+test_array [0] = 0
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
+  ;
+  return 0;
+}
 _ACEOF
-                case "$host_os" in
-    aix*) gl_absname_cpp="$ac_cpp -C" ;;
-    *)    gl_absname_cpp="$ac_cpp" ;;
-  esac
-
-  case "$host_os" in
-    mingw*)
-                                          gl_dirsep_regex='[/\\]'
-      ;;
-    *)
-      gl_dirsep_regex='\/'
-      ;;
-  esac
-      gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
-  gl_header_literal_regex=`echo 'stdint.h' \
-                           | sed -e "$gl_make_literal_regex_sed"`
-  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
-      s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
-      s|^/[^/]|//&|
-      p
-      q
-    }'
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-        gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
-  sed -n "$gl_absolute_header_sed"`
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
-           gl_header=$gl_cv_absolute_stdint_h
-           gl_cv_next_stdint_h='"'$gl_header'"'
-          else
-               gl_cv_next_stdint_h='<'stdint.h'>'
-             fi
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
-$as_echo "$gl_cv_next_stdint_h" >&6; }
-     fi
-     NEXT_STDINT_H=$gl_cv_next_stdint_h
 
-     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
-       gl_next_as_first_directive='<'stdint.h'>'
-     else
-       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
-       gl_next_as_first_directive=$gl_cv_next_stdint_h
-     fi
-     NEXT_AS_FIRST_DIRECTIVE_STDINT_H=$gl_next_as_first_directive
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo= ac_hi=
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  if test $ac_cv_header_stdint_h = yes; then
-    HAVE_STDINT_H=1
-  else
-    HAVE_STDINT_H=0
-  fi
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
 
-    if test $ac_cv_header_stdint_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
-$as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-if ${gl_cv_header_working_stdint_h+:} false; then :
-  $as_echo_n "(cached) " >&6
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  gl_cv_header_working_stdint_h=no
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
-/* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
-#if !(defined WCHAR_MIN && defined WCHAR_MAX)
-#error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
-#endif
+	ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) result=$ac_lo;;
+'') result=unknown ;;
+esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
@@ -21216,160 +29391,164 @@ else
   # include <wchar.h>
   #endif
 
+#include <limits.h>
+static long int longval () { return sizeof ($gltype) * CHAR_BIT; }
+static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
 
-#ifdef INT8_MAX
-int8_t a1 = INT8_MAX;
-int8_t a1min = INT8_MIN;
-#endif
-#ifdef INT16_MAX
-int16_t a2 = INT16_MAX;
-int16_t a2min = INT16_MIN;
-#endif
-#ifdef INT32_MAX
-int32_t a3 = INT32_MAX;
-int32_t a3min = INT32_MIN;
-#endif
-#ifdef INT64_MAX
-int64_t a4 = INT64_MAX;
-int64_t a4min = INT64_MIN;
-#endif
-#ifdef UINT8_MAX
-uint8_t b1 = UINT8_MAX;
-#else
-typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
-#endif
-#ifdef UINT16_MAX
-uint16_t b2 = UINT16_MAX;
-#endif
-#ifdef UINT32_MAX
-uint32_t b3 = UINT32_MAX;
-#endif
-#ifdef UINT64_MAX
-uint64_t b4 = UINT64_MAX;
-#endif
-int_least8_t c1 = INT8_C (0x7f);
-int_least8_t c1max = INT_LEAST8_MAX;
-int_least8_t c1min = INT_LEAST8_MIN;
-int_least16_t c2 = INT16_C (0x7fff);
-int_least16_t c2max = INT_LEAST16_MAX;
-int_least16_t c2min = INT_LEAST16_MIN;
-int_least32_t c3 = INT32_C (0x7fffffff);
-int_least32_t c3max = INT_LEAST32_MAX;
-int_least32_t c3min = INT_LEAST32_MIN;
-int_least64_t c4 = INT64_C (0x7fffffffffffffff);
-int_least64_t c4max = INT_LEAST64_MAX;
-int_least64_t c4min = INT_LEAST64_MIN;
-uint_least8_t d1 = UINT8_C (0xff);
-uint_least8_t d1max = UINT_LEAST8_MAX;
-uint_least16_t d2 = UINT16_C (0xffff);
-uint_least16_t d2max = UINT_LEAST16_MAX;
-uint_least32_t d3 = UINT32_C (0xffffffff);
-uint_least32_t d3max = UINT_LEAST32_MAX;
-uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
-uint_least64_t d4max = UINT_LEAST64_MAX;
-int_fast8_t e1 = INT_FAST8_MAX;
-int_fast8_t e1min = INT_FAST8_MIN;
-int_fast16_t e2 = INT_FAST16_MAX;
-int_fast16_t e2min = INT_FAST16_MIN;
-int_fast32_t e3 = INT_FAST32_MAX;
-int_fast32_t e3min = INT_FAST32_MIN;
-int_fast64_t e4 = INT_FAST64_MAX;
-int_fast64_t e4min = INT_FAST64_MIN;
-uint_fast8_t f1 = UINT_FAST8_MAX;
-uint_fast16_t f2 = UINT_FAST16_MAX;
-uint_fast32_t f3 = UINT_FAST32_MAX;
-uint_fast64_t f4 = UINT_FAST64_MAX;
-#ifdef INTPTR_MAX
-intptr_t g = INTPTR_MAX;
-intptr_t gmin = INTPTR_MIN;
-#endif
-#ifdef UINTPTR_MAX
-uintptr_t h = UINTPTR_MAX;
-#endif
-intmax_t i = INTMAX_MAX;
-uintmax_t j = UINTMAX_MAX;
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if ((sizeof ($gltype) * CHAR_BIT) < 0)
+    {
+      long int i = longval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
 
-#include <limits.h> /* for CHAR_BIT */
-#define TYPE_MINIMUM(t) \
-  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
-  ((t) ((t) 0 < (t) -1 \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-struct s {
-  int check_PTRDIFF:
-      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
-      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
-      ? 1 : -1;
-  /* Detect bug in FreeBSD 6.0 / ia64.  */
-  int check_SIG_ATOMIC:
-      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
-      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
-      ? 1 : -1;
-  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
-  int check_WCHAR:
-      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
-      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
-      ? 1 : -1;
-  /* Detect bug in mingw.  */
-  int check_WINT:
-      WINT_MIN == TYPE_MINIMUM (wint_t)
-      && WINT_MAX == TYPE_MAXIMUM (wint_t)
-      ? 1 : -1;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  result=`cat conftest.val`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+result=unknown
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
+       eval gl_cv_bitsizeof_${gltype}=\$result
+
+fi
+ac_res=`eval 'as_val=${'gl_cv_bitsizeof_${gltype}'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    eval result=\$gl_cv_bitsizeof_${gltype}
+    if test $result = unknown; then
+                                                result=0
+    fi
+    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+    cat >>confdefs.h <<_ACEOF
+#define BITSIZEOF_${GLTYPE} $result
+_ACEOF
 
-  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
-  int check_UINT8_C:
-        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
-  int check_UINT16_C:
-        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+    eval BITSIZEOF_${GLTYPE}=\$result
+  done
 
-  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
-#ifdef UINT8_MAX
-  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
-#endif
-#ifdef UINT16_MAX
-  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
-#endif
-#ifdef UINT32_MAX
-  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
-#endif
-#ifdef UINT64_MAX
-  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
-#endif
-  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
-  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
-  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
-  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
-  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
-  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
-  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
-  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
-  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
-  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
-  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
-};
 
+  fi
+
+
+
+
+
+  for gltype in sig_atomic_t wchar_t wint_t ; do
+    { $as_echo "$as_me:$LINENO: checking for bit size of $gltype" >&5
+$as_echo_n "checking for bit size of $gltype... " >&6; }
+if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
 int
 main ()
 {
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-                                                    if test "$cross_compiling" = yes; then :
-                 gl_cv_header_working_stdint_h=yes
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-
-#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
-#include <stdint.h>
-
-
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
   #include <stddef.h>
@@ -21380,119 +29559,184 @@ else
   # include <wchar.h>
   #endif
 
-
-#include <stdio.h>
-#include <string.h>
-#define MVAL(macro) MVAL1(macro)
-#define MVAL1(expression) #expression
-static const char *macro_values[] =
-  {
-#ifdef INT8_MAX
-    MVAL (INT8_MAX),
-#endif
-#ifdef INT16_MAX
-    MVAL (INT16_MAX),
-#endif
-#ifdef INT32_MAX
-    MVAL (INT32_MAX),
-#endif
-#ifdef INT64_MAX
-    MVAL (INT64_MAX),
-#endif
-#ifdef UINT8_MAX
-    MVAL (UINT8_MAX),
-#endif
-#ifdef UINT16_MAX
-    MVAL (UINT16_MAX),
-#endif
-#ifdef UINT32_MAX
-    MVAL (UINT32_MAX),
-#endif
-#ifdef UINT64_MAX
-    MVAL (UINT64_MAX),
-#endif
-    NULL
-  };
-
+#include <limits.h>
 int
 main ()
 {
-
-  const char **mv;
-  for (mv = macro_values; *mv != NULL; mv++)
-    {
-      const char *value = *mv;
-      /* Test whether it looks like a cast expression.  */
-      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
-          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
-          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
-          || strncmp (value, "((int)"/*)*/, 6) == 0
-          || strncmp (value, "((signed short)"/*)*/, 15) == 0
-          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
-        return mv - macro_values + 1;
-    }
-  return 0;
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  gl_cv_header_working_stdint_h=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr $ac_mid + 1`
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid + 1`
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
-$as_echo "$gl_cv_header_working_stdint_h" >&6; }
-  fi
-  if test "$gl_cv_header_working_stdint_h" = yes; then
-    STDINT_H=
-  else
-            for ac_header in sys/inttypes.h sys/bitypes.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
 
-done
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)];
+test_array [0] = 0
 
-    if test $ac_cv_header_sys_inttypes_h = yes; then
-      HAVE_SYS_INTTYPES_H=1
-    else
-      HAVE_SYS_INTTYPES_H=0
-    fi
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    if test $ac_cv_header_sys_bitypes_h = yes; then
-      HAVE_SYS_BITYPES_H=1
-    else
-      HAVE_SYS_BITYPES_H=0
-    fi
+  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+     included before <wchar.h>.  */
+  #include <stddef.h>
+  #include <signal.h>
+  #if HAVE_WCHAR_H
+  # include <stdio.h>
+  # include <time.h>
+  # include <wchar.h>
+  #endif
+
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_lo=$ac_mid; break
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_hi=`expr '(' $ac_mid ')' - 1`
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			ac_mid=`expr 2 '*' $ac_mid`
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo= ac_hi=
+fi
 
-  if test $APPLE_UNIVERSAL_BUILD = 0; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
   #include <stddef.h>
@@ -21503,41 +29747,57 @@ else
   # include <wchar.h>
   #endif
 
-#include <limits.h>"; then :
+#include <limits.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)];
+test_array [0] = 0
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_hi=$ac_mid
 else
-  result=unknown
-fi
-
-       eval gl_cv_bitsizeof_${gltype}=\$result
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_lo=`expr '(' $ac_mid ')' + 1`
 fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    eval result=\$gl_cv_bitsizeof_${gltype}
-    if test $result = unknown; then
-                                                result=0
-    fi
-    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
-    cat >>confdefs.h <<_ACEOF
-#define BITSIZEOF_${GLTYPE} $result
-_ACEOF
-
-    eval BITSIZEOF_${GLTYPE}=\$result
-  done
-
-
-  fi
-
 
-  for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
-$as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
-  $as_echo_n "(cached) " >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) result=$ac_lo;;
+'') result=unknown ;;
+esac
 else
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
   #include <stddef.h>
@@ -21548,17 +29808,81 @@ else
   # include <wchar.h>
   #endif
 
-#include <limits.h>"; then :
+#include <limits.h>
+static long int longval () { return sizeof ($gltype) * CHAR_BIT; }
+static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if ((sizeof ($gltype) * CHAR_BIT) < 0)
+    {
+      long int i = longval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != (sizeof ($gltype) * CHAR_BIT))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
 
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  result=`cat conftest.val`
 else
-  result=unknown
-fi
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+( exit $ac_status )
+result=unknown
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.val
        eval gl_cv_bitsizeof_${gltype}=\$result
 
 fi
-eval ac_res=\$gl_cv_bitsizeof_${gltype}
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'gl_cv_bitsizeof_${gltype}'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
     eval result=\$gl_cv_bitsizeof_${gltype}
     if test $result = unknown; then
@@ -21575,13 +29899,20 @@ _ACEOF
 
 
 
+
+
+
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gltype is signed" >&5
 $as_echo_n "checking whether $gltype is signed... " >&6; }
-if eval \${gl_cv_type_${gltype}_signed+:} false; then :
+if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -21603,17 +29934,39 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   result=yes
 else
-  result=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	result=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
        eval gl_cv_type_${gltype}_signed=\$result
 
 fi
-eval ac_res=\$gl_cv_type_${gltype}_signed
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_signed'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
     eval result=\$gl_cv_type_${gltype}_signed
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
@@ -21634,10 +29987,12 @@ _ACEOF
   if test $APPLE_UNIVERSAL_BUILD = 0; then
 
 
+
+
   for gltype in ptrdiff_t size_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { $as_echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5
 $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval gl_cv_type_${gltype}_suffix=no
@@ -21658,7 +30013,11 @@ else
            ull) gltype1='unsigned long long int';;
            ui64)gltype1='unsigned __int64';;
          esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+         cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -21681,16 +30040,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval gl_cv_type_${gltype}_suffix=\$glsuf
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
        done
 fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_suffix'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
@@ -21706,10 +30089,13 @@ _ACEOF
   fi
 
 
+
+
+
   for gltype in sig_atomic_t wchar_t wint_t ; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
+    { $as_echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5
 $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval gl_cv_type_${gltype}_suffix=no
@@ -21730,7 +30116,11 @@ else
            ull) gltype1='unsigned long long int';;
            ui64)gltype1='unsigned __int64';;
          esac
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+         cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -21753,16 +30143,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval gl_cv_type_${gltype}_suffix=\$glsuf
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
        done
 fi
-eval ac_res=\$gl_cv_type_${gltype}_suffix
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'gl_cv_type_${gltype}_suffix'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
     GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
     eval result=\$gl_cv_type_${gltype}_suffix
@@ -21794,9 +30208,102 @@ fi
 
 
 
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
+if test "${ac_cv_type_pid_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_pid_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (pid_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((pid_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_pid_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+$as_echo "$ac_cv_type_pid_t" >&6; }
+if test "x$ac_cv_type_pid_t" = x""yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -21805,9 +30312,102 @@ _ACEOF
 
 fi
 
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+$as_echo_n "checking for mode_t... " >&6; }
+if test "${ac_cv_type_mode_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_mode_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof (mode_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((mode_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_mode_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+$as_echo "$ac_cv_type_mode_t" >&6; }
+if test "x$ac_cv_type_mode_t" = x""yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -21835,15 +30435,19 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_sys_types_h='<'sys/types.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/types.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <sys/types.h>" >&5
 $as_echo_n "checking absolute name of <sys/types.h>... " >&6; }
-if ${gl_cv_next_sys_types_h+:} false; then :
+if test "${gl_cv_next_sys_types_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 _ACEOF
@@ -21878,7 +30482,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_types_h" >&5
 $as_echo "$gl_cv_next_sys_types_h" >&6; }
      fi
      NEXT_SYS_TYPES_H=$gl_cv_next_sys_types_h
@@ -22032,6 +30636,11 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
 
 
 
+
+
+
+
+
   if test $ac_cv_header_features_h = yes; then
     HAVE_FEATURES_H=1
   else
@@ -22040,12 +30649,16 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5
+  { $as_echo "$as_me:$LINENO: checking for wint_t" >&5
 $as_echo_n "checking for wint_t... " >&6; }
-if ${gt_cv_c_wint_t+:} false; then :
+if test "${gt_cv_c_wint_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -22065,18 +30678,41 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gt_cv_c_wint_t=yes
 else
-  gt_cv_c_wint_t=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_c_wint_t=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
 $as_echo "$gt_cv_c_wint_t" >&6; }
   if test $gt_cv_c_wint_t = yes; then
 
-$as_echo "#define HAVE_WINT_T 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WINT_T 1
+_ACEOF
 
   fi
 
@@ -22126,13 +30762,17 @@ fi
 
   # Define an additional variable used in the Makefile substitution.
   if test $ac_cv_working_alloca_h = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5
+    { $as_echo "$as_me:$LINENO: checking for alloca as a compiler built-in" >&5
 $as_echo_n "checking for alloca as a compiler built-in... " >&6; }
-if ${gl_cv_rpl_alloca+:} false; then :
+if test "${gl_cv_rpl_alloca+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #if defined __GNUC__ || defined _AIX || defined _MSC_VER
@@ -22141,7 +30781,7 @@ else
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Need own alloca" >/dev/null 2>&1; then :
+  $EGREP "Need own alloca" >/dev/null 2>&1; then
   gl_cv_rpl_alloca=yes
 else
   gl_cv_rpl_alloca=no
@@ -22150,11 +30790,13 @@ rm -f conftest*
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_rpl_alloca" >&5
 $as_echo "$gl_cv_rpl_alloca" >&6; }
     if test $gl_cv_rpl_alloca = yes; then
 
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
 
       ALLOCA_H=alloca.h
     else
@@ -22179,6 +30821,11 @@ fi
 
 
 
+
+
+
+
+
   if test $ac_cv_func_btowc = no; then
     HAVE_BTOWC=0
   else
@@ -22186,13 +30833,13 @@ fi
 
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(0) is correct" >&5
+        { $as_echo "$as_me:$LINENO: checking whether btowc(0) is correct" >&5
 $as_echo_n "checking whether btowc(0) is correct... " >&6; }
-if ${gl_cv_func_btowc_nul+:} false; then :
+if test "${gl_cv_func_btowc_nul+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
 
            case "$host_os" in
                       # Guess no on Cygwin.
@@ -22202,7 +30849,11 @@ else
            esac
 
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -22221,23 +30872,50 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_btowc_nul=yes
 else
-  gl_cv_func_btowc_nul=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_btowc_nul=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_nul" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_btowc_nul" >&5
 $as_echo "$gl_cv_func_btowc_nul" >&6; }
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether btowc(EOF) is correct" >&5
+        { $as_echo "$as_me:$LINENO: checking whether btowc(EOF) is correct" >&5
 $as_echo_n "checking whether btowc(EOF) is correct... " >&6; }
-if ${gl_cv_func_btowc_eof+:} false; then :
+if test "${gl_cv_func_btowc_eof+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -22248,10 +30926,14 @@ else
           *)     gl_cv_func_btowc_eof="guessing yes" ;;
         esac
         if test $LOCALE_FR != none; then
-          if test "$cross_compiling" = yes; then :
+          if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -22274,19 +30956,46 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_btowc_eof=yes
 else
-  gl_cv_func_btowc_eof=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_btowc_eof=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
         fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_btowc_eof" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_btowc_eof" >&5
 $as_echo "$gl_cv_func_btowc_eof" >&6; }
 
     case "$gl_cv_func_btowc_nul" in
@@ -22325,17 +31034,158 @@ $as_echo "$gl_cv_func_btowc_eof" >&6; }
 
 
 
-$as_echo "#define GNULIB_TEST_BTOWC 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_BTOWC 1
+_ACEOF
+
+
+
+
+
+for ac_header in byteswap.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-    for ac_header in byteswap.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
-if test "x$ac_cv_header_byteswap_h" = xyes; then :
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_BYTESWAP_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
     BYTESWAP_H=''
@@ -22416,12 +31266,17 @@ fi
 
 
 
+
+
+
+
+
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_langinfo_h='<'langinfo.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <langinfo.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <langinfo.h>" >&5
 $as_echo_n "checking absolute name of <langinfo.h>... " >&6; }
-if ${gl_cv_next_langinfo_h+:} false; then :
+if test "${gl_cv_next_langinfo_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -22430,7 +31285,11 @@ else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 _ACEOF
@@ -22468,7 +31327,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_langinfo_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_langinfo_h" >&5
 $as_echo "$gl_cv_next_langinfo_h" >&6; }
      fi
      NEXT_LANGINFO_H=$gl_cv_next_langinfo_h
@@ -22491,14 +31350,23 @@ $as_echo "$gl_cv_next_langinfo_h" >&6; }
   HAVE_LANGINFO_ERA=0
   HAVE_LANGINFO_YESEXPR=0
 
+
+
+
+
+
   if test $ac_cv_header_langinfo_h = yes; then
     HAVE_LANGINFO_H=1
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines CODESET" >&5
+            { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines CODESET" >&5
 $as_echo_n "checking whether langinfo.h defines CODESET... " >&6; }
-if ${gl_cv_header_langinfo_codeset+:} false; then :
+if test "${gl_cv_header_langinfo_codeset+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 int a = CODESET;
@@ -22511,25 +31379,50 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_langinfo_codeset=yes
 else
-  gl_cv_header_langinfo_codeset=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_langinfo_codeset=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_codeset" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_codeset" >&5
 $as_echo "$gl_cv_header_langinfo_codeset" >&6; }
     if test $gl_cv_header_langinfo_codeset = yes; then
       HAVE_LANGINFO_CODESET=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines T_FMT_AMPM" >&5
+    { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines T_FMT_AMPM" >&5
 $as_echo_n "checking whether langinfo.h defines T_FMT_AMPM... " >&6; }
-if ${gl_cv_header_langinfo_t_fmt_ampm+:} false; then :
+if test "${gl_cv_header_langinfo_t_fmt_ampm+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 int a = T_FMT_AMPM;
@@ -22542,25 +31435,50 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_langinfo_t_fmt_ampm=yes
 else
-  gl_cv_header_langinfo_t_fmt_ampm=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_langinfo_t_fmt_ampm=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_t_fmt_ampm" >&5
 $as_echo "$gl_cv_header_langinfo_t_fmt_ampm" >&6; }
     if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
       HAVE_LANGINFO_T_FMT_AMPM=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines ERA" >&5
+    { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines ERA" >&5
 $as_echo_n "checking whether langinfo.h defines ERA... " >&6; }
-if ${gl_cv_header_langinfo_era+:} false; then :
+if test "${gl_cv_header_langinfo_era+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 int a = ERA;
@@ -22573,25 +31491,50 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_langinfo_era=yes
 else
-  gl_cv_header_langinfo_era=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_langinfo_era=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_era" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_era" >&5
 $as_echo "$gl_cv_header_langinfo_era" >&6; }
     if test $gl_cv_header_langinfo_era = yes; then
       HAVE_LANGINFO_ERA=1
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether langinfo.h defines YESEXPR" >&5
+    { $as_echo "$as_me:$LINENO: checking whether langinfo.h defines YESEXPR" >&5
 $as_echo_n "checking whether langinfo.h defines YESEXPR... " >&6; }
-if ${gl_cv_header_langinfo_yesexpr+:} false; then :
+if test "${gl_cv_header_langinfo_yesexpr+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 int a = YESEXPR;
@@ -22604,15 +31547,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_langinfo_yesexpr=yes
 else
-  gl_cv_header_langinfo_yesexpr=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_langinfo_yesexpr=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_langinfo_yesexpr" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_langinfo_yesexpr" >&5
 $as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
     if test $gl_cv_header_langinfo_yesexpr = yes; then
       HAVE_LANGINFO_YESEXPR=1
@@ -22627,14 +31591,19 @@ $as_echo "$gl_cv_header_langinfo_yesexpr" >&6; }
 
 
 
-    for gl_func in nl_langinfo; do
+
+  for gl_func in nl_langinfo; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 
@@ -22647,23 +31616,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
                      eval ac_cv_have_decl_$gl_func=yes
 fi
+
       done
 
 
@@ -22675,6 +31669,9 @@ fi
 
 
 
+
+
+
   LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
 
 
@@ -22688,17 +31685,23 @@ fi
   case "$host_os" in
     solaris*)
 
-$as_echo "#define _LCONV_C99 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _LCONV_C99 1
+_ACEOF
 
       ;;
   esac
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h conforms to POSIX:2001" >&5
+  { $as_echo "$as_me:$LINENO: checking whether locale.h conforms to POSIX:2001" >&5
 $as_echo_n "checking whether locale.h conforms to POSIX:2001... " >&6; }
-if ${gl_cv_header_locale_h_posix2001+:} false; then :
+if test "${gl_cv_header_locale_h_posix2001+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <locale.h>
             int x = LC_MESSAGES;
@@ -22711,25 +31714,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_locale_h_posix2001=yes
 else
-  gl_cv_header_locale_h_posix2001=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_locale_h_posix2001=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_h_posix2001" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_locale_h_posix2001" >&5
 $as_echo "$gl_cv_header_locale_h_posix2001" >&6; }
 
 
+
+
+
+
+
   if test $ac_cv_header_xlocale_h = yes; then
     HAVE_XLOCALE_H=1
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether locale.h defines locale_t" >&5
+                { $as_echo "$as_me:$LINENO: checking whether locale.h defines locale_t" >&5
 $as_echo_n "checking whether locale.h defines locale_t... " >&6; }
-if ${gl_cv_header_locale_has_locale_t+:} false; then :
+if test "${gl_cv_header_locale_has_locale_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <locale.h>
               locale_t x;
@@ -22741,15 +31774,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_header_locale_has_locale_t=yes
 else
-  gl_cv_header_locale_has_locale_t=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_header_locale_has_locale_t=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_locale_has_locale_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_header_locale_has_locale_t" >&5
 $as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
     if test $gl_cv_header_locale_has_locale_t = yes; then
       gl_cv_header_locale_h_needs_xlocale_h=no
@@ -22762,12 +31816,16 @@ $as_echo "$gl_cv_header_locale_has_locale_t" >&6; }
   fi
 
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct lconv is properly defined" >&5
+          { $as_echo "$as_me:$LINENO: checking whether struct lconv is properly defined" >&5
 $as_echo_n "checking whether struct lconv is properly defined... " >&6; }
-if ${gl_cv_sys_struct_lconv_ok+:} false; then :
+if test "${gl_cv_sys_struct_lconv_ok+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <locale.h>
             struct lconv l;
@@ -22781,15 +31839,36 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_sys_struct_lconv_ok=yes
 else
-  gl_cv_sys_struct_lconv_ok=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_sys_struct_lconv_ok=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_lconv_ok" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_sys_struct_lconv_ok" >&5
 $as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
   if test $gl_cv_sys_struct_lconv_ok = no; then
     REPLACE_STRUCT_LCONV=1
@@ -22806,15 +31885,19 @@ $as_echo "$gl_cv_sys_struct_lconv_ok" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_locale_h='<'locale.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <locale.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <locale.h>" >&5
 $as_echo_n "checking absolute name of <locale.h>... " >&6; }
-if ${gl_cv_next_locale_h+:} false; then :
+if test "${gl_cv_next_locale_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <locale.h>
 _ACEOF
@@ -22849,7 +31932,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_locale_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_locale_h" >&5
 $as_echo "$gl_cv_next_locale_h" >&6; }
      fi
      NEXT_LOCALE_H=$gl_cv_next_locale_h
@@ -22868,14 +31951,20 @@ $as_echo "$gl_cv_next_locale_h" >&6; }
 
 
 
-    for gl_func in setlocale duplocale; do
+
+
+  for gl_func in setlocale duplocale; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <locale.h>
 /* Some systems provide declarations in a non-standard header.  */
@@ -22892,23 +31981,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
                      eval ac_cv_have_decl_$gl_func=yes
 fi
+
       done
 
 
@@ -22932,9 +32046,104 @@ fi
   gl_LIBOBJS="$gl_LIBOBJS localeconv.$ac_objext"
 
 
-  ac_fn_c_check_member "$LINENO" "struct lconv" "decimal_point" "ac_cv_member_struct_lconv_decimal_point" "#include <locale.h>
-"
-if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes; then :
+  { $as_echo "$as_me:$LINENO: checking for struct lconv.decimal_point" >&5
+$as_echo_n "checking for struct lconv.decimal_point... " >&6; }
+if test "${ac_cv_member_struct_lconv_decimal_point+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <locale.h>
+
+int
+main ()
+{
+static struct lconv ac_aggr;
+if (ac_aggr.decimal_point)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_lconv_decimal_point=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <locale.h>
+
+int
+main ()
+{
+static struct lconv ac_aggr;
+if (sizeof ac_aggr.decimal_point)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_member_struct_lconv_decimal_point=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_member_struct_lconv_decimal_point=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_lconv_decimal_point" >&5
+$as_echo "$ac_cv_member_struct_lconv_decimal_point" >&6; }
+if test "x$ac_cv_member_struct_lconv_decimal_point" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_LCONV_DECIMAL_POINT 1
@@ -22956,7 +32165,9 @@ fi
 
 
 
-$as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_LOCALECONV 1
+_ACEOF
 
 
 
@@ -22965,19 +32176,119 @@ $as_echo "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h
   if test "$gl_threads_api" = posix; then
     # OSF/1 4.0 and Mac OS X 10.1 lack the pthread_rwlock_t type and the
     # pthread_rwlock_* functions.
-    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>
-"
-if test "x$ac_cv_type_pthread_rwlock_t" = xyes; then :
+    { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
+$as_echo_n "checking for pthread_rwlock_t... " >&6; }
+if test "${ac_cv_type_pthread_rwlock_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_pthread_rwlock_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+
+int
+main ()
+{
+if (sizeof (pthread_rwlock_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+
+int
+main ()
+{
+if (sizeof ((pthread_rwlock_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_pthread_rwlock_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
 
-$as_echo "#define HAVE_PTHREAD_RWLOCK 1" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pthread_rwlock_t" >&5
+$as_echo "$ac_cv_type_pthread_rwlock_t" >&6; }
+if test "x$ac_cv_type_pthread_rwlock_t" = x""yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PTHREAD_RWLOCK 1
+_ACEOF
 
 fi
 
     # glibc defines PTHREAD_MUTEX_RECURSIVE as enum, not as a macro.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+    cat >conftest.$ac_ext <<_ACEOF
 
-      #include <pthread.h>
+      /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
 int
 main ()
 {
@@ -22996,11 +32307,36 @@ return !x;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
+_ACEOF
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE 1" >>confdefs.h
 
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
   :
@@ -23022,13 +32358,23 @@ _ACEOF
 
 
 
+
+
+
+
+
+
+
+
+
+
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23039,10 +32385,14 @@ else
         *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23071,27 +32421,54 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_incomplete_state=yes
 else
-  gl_cv_func_mbrtowc_incomplete_state=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_incomplete_state=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
 $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23102,10 +32479,14 @@ else
         *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
       esac
       if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23138,19 +32519,46 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_sanitycheck=yes
 else
-  gl_cv_func_mbrtowc_sanitycheck=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_sanitycheck=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
 $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
     REPLACE_MBSTATE_T=0
@@ -23168,9 +32576,25 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
+
+
+
+
+
   if test $ac_cv_func_mbrtowc = no; then
     HAVE_MBRTOWC=0
-    ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
+    { $as_echo "$as_me:$LINENO: checking whether mbrtowc is declared" >&5
+$as_echo_n "checking whether mbrtowc is declared... " >&6; }
+if test "${ac_cv_have_decl_mbrtowc+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -23180,17 +32604,64 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 #include <time.h>
 #include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbrtowc" = xyes; then :
-  ac_have_decl=1
+
+int
+main ()
+{
+#ifndef mbrtowc
+  (void) mbrtowc;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_mbrtowc=yes
 else
-  ac_have_decl=0
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_mbrtowc=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mbrtowc" >&5
+$as_echo "$ac_cv_have_decl_mbrtowc" >&6; }
+if test "x$ac_cv_have_decl_mbrtowc" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBRTOWC $ac_have_decl
+#define HAVE_DECL_MBRTOWC 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBRTOWC 0
 _ACEOF
 
+
+fi
+
+
     if test $ac_cv_have_decl_mbrtowc = yes; then
                         REPLACE_MBRTOWC=1
     fi
@@ -23201,9 +32672,9 @@ _ACEOF
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL pwc argument" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL pwc argument" >&5
 $as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg1+:} false; then :
+if test "${gl_cv_func_mbrtowc_null_arg1+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23214,10 +32685,14 @@ else
         *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
       esac
       if test $LOCALE_FR_UTF8 != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23260,27 +32735,54 @@ int main ()
   return result;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_null_arg1=yes
 else
-  gl_cv_func_mbrtowc_null_arg1=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_null_arg1=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg1" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg1" >&5
 $as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles a NULL string argument" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL string argument" >&5
 $as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; }
-if ${gl_cv_func_mbrtowc_null_arg2+:} false; then :
+if test "${gl_cv_func_mbrtowc_null_arg2+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23291,10 +32793,14 @@ else
         *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
       esac
       if test $LOCALE_FR_UTF8 != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23325,19 +32831,46 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_null_arg2=yes
 else
-  gl_cv_func_mbrtowc_null_arg2=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_null_arg2=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_null_arg2" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg2" >&5
 $as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
 
 
@@ -23345,9 +32878,9 @@ $as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; }
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc has a correct return value" >&5
+  { $as_echo "$as_me:$LINENO: checking whether mbrtowc has a correct return value" >&5
 $as_echo_n "checking whether mbrtowc has a correct return value... " >&6; }
-if ${gl_cv_func_mbrtowc_retval+:} false; then :
+if test "${gl_cv_func_mbrtowc_retval+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23359,10 +32892,14 @@ else
       esac
       if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
          || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23460,30 +32997,57 @@ int main ()
   return (found_some_locale ? result : 77);
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_retval=yes
 else
-  if test $? != 77; then
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+if test $? != 77; then
              gl_cv_func_mbrtowc_retval=no
            fi
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_retval" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_retval" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc returns 0 when parsing a NUL character" >&5
 $as_echo_n "checking whether mbrtowc returns 0 when parsing a NUL character... " >&6; }
-if ${gl_cv_func_mbrtowc_nul_retval+:} false; then :
+if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23494,10 +33058,14 @@ else
         *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
       esac
       if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23525,26 +33093,53 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_nul_retval=yes
 else
-  gl_cv_func_mbrtowc_nul_retval=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_nul_retval=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_nul_retval" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_nul_retval" >&5
 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; }
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works on empty input" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc works on empty input" >&5
 $as_echo_n "checking whether mbrtowc works on empty input... " >&6; }
-if ${gl_cv_func_mbrtowc_empty_input+:} false; then :
+if test "${gl_cv_func_mbrtowc_empty_input+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23554,10 +33149,14 @@ else
                     gl_cv_func_mbrtowc_empty_input="guessing no" ;;
         *)          gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
       esac
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
            #include <wchar.h>
@@ -23569,24 +33168,53 @@ else
              return mbrtowc (&wc, "", 0, &mbs) == (size_t) -2;
            }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_empty_input=no
 else
-  gl_cv_func_mbrtowc_empty_input=yes
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_empty_input=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_empty_input" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_empty_input" >&5
 $as_echo "$gl_cv_func_mbrtowc_empty_input" >&6; }
 
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MBRTOWC_NULL_ARG1_BUG 1
+_ACEOF
 
            REPLACE_MBRTOWC=1
            ;;
@@ -23594,7 +33222,9 @@ $as_echo "#define MBRTOWC_NULL_ARG1_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_null_arg2" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MBRTOWC_NULL_ARG2_BUG 1
+_ACEOF
 
            REPLACE_MBRTOWC=1
            ;;
@@ -23602,7 +33232,9 @@ $as_echo "#define MBRTOWC_NULL_ARG2_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_retval" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MBRTOWC_RETVAL_BUG 1
+_ACEOF
 
            REPLACE_MBRTOWC=1
            ;;
@@ -23610,7 +33242,9 @@ $as_echo "#define MBRTOWC_RETVAL_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_nul_retval" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MBRTOWC_NUL_RETVAL_BUG 1
+_ACEOF
 
            REPLACE_MBRTOWC=1
            ;;
@@ -23618,7 +33252,9 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h
       case "$gl_cv_func_mbrtowc_empty_input" in
         *yes) ;;
         *)
-$as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MBRTOWC_EMPTY_INPUT_BUG 1
+_ACEOF
 
            REPLACE_MBRTOWC=1
            ;;
@@ -23652,7 +33288,19 @@ $as_echo "#define MBRTOWC_EMPTY_INPUT_BUG 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_MBRTOWC 1
+_ACEOF
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -23671,9 +33319,9 @@ $as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23684,10 +33332,14 @@ else
         *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23716,27 +33368,54 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_incomplete_state=yes
 else
-  gl_cv_func_mbrtowc_incomplete_state=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_incomplete_state=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
 $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -23747,10 +33426,14 @@ else
         *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
       esac
       if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -23783,19 +33466,46 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_sanitycheck=yes
 else
-  gl_cv_func_mbrtowc_sanitycheck=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_sanitycheck=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
 $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
     REPLACE_MBSTATE_T=0
@@ -23813,9 +33523,25 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
+
+
+
+
+
   if test $ac_cv_func_mbsinit = no; then
     HAVE_MBSINIT=0
-    ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
+    { $as_echo "$as_me:$LINENO: checking whether mbsinit is declared" >&5
+$as_echo_n "checking whether mbsinit is declared... " >&6; }
+if test "${ac_cv_have_decl_mbsinit+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
    BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@@ -23825,17 +33551,64 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 #include <time.h>
 #include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_mbsinit" = xyes; then :
-  ac_have_decl=1
+
+int
+main ()
+{
+#ifndef mbsinit
+  (void) mbsinit;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_mbsinit=yes
 else
-  ac_have_decl=0
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_mbsinit=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_mbsinit" >&5
+$as_echo "$ac_cv_have_decl_mbsinit" >&6; }
+if test "x$ac_cv_have_decl_mbsinit" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_MBSINIT $ac_have_decl
+#define HAVE_DECL_MBSINIT 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MBSINIT 0
 _ACEOF
 
+
+fi
+
+
     if test $ac_cv_have_decl_mbsinit = yes; then
                         REPLACE_MBSINIT=1
     fi
@@ -23875,7 +33648,9 @@ _ACEOF
 
 
 
-$as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_MBSINIT 1
+_ACEOF
 
 
 
@@ -23912,7 +33687,14 @@ $as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_MBTOWC 1
+_ACEOF
+
+
+
+
+
 
 
 
@@ -23923,12 +33705,12 @@ $as_echo "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h
 
      if test $ac_cv_func_nl_langinfo = yes; then
     # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken.
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether YESEXPR works" >&5
+    { $as_echo "$as_me:$LINENO: checking whether YESEXPR works" >&5
 $as_echo_n "checking whether YESEXPR works... " >&6; }
-if ${gl_cv_func_nl_langinfo_yesexpr_works+:} false; then :
+if test "${gl_cv_func_nl_langinfo_yesexpr_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
 
          case "$host_os" in
                    # Guess no on irix systems.
@@ -23938,7 +33720,11 @@ else
          esac
 
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <langinfo.h>
 
@@ -23951,18 +33737,45 @@ return !*nl_langinfo(YESEXPR);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_nl_langinfo_yesexpr_works=yes
 else
-  gl_cv_func_nl_langinfo_yesexpr_works=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_nl_langinfo_yesexpr_works=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5
 $as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; }
     case $gl_cv_func_nl_langinfo_yesexpr_works in
       *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;;
@@ -23979,7 +33792,9 @@ _ACEOF
     else
       REPLACE_NL_LANGINFO=1
 
-$as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define REPLACE_NL_LANGINFO 1
+_ACEOF
 
     fi
   else
@@ -24009,14 +33824,16 @@ $as_echo "#define REPLACE_NL_LANGINFO 1" >>confdefs.h
 
 
 
-$as_echo "#define GNULIB_TEST_NL_LANGINFO 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_NL_LANGINFO 1
+_ACEOF
 
 
 
 
 
 # Check whether --with-included-regex was given.
-if test "${with_included_regex+set}" = set; then :
+if test "${with_included_regex+set}" = set; then
   withval=$with_included_regex;
 fi
 
@@ -24031,15 +33848,27 @@ fi
     # regex.c.
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking for working re_compile_pattern" >&5
 $as_echo_n "checking for working re_compile_pattern... " >&6; }
-if ${gl_cv_func_re_compile_pattern_working+:} false; then :
+if test "${gl_cv_func_re_compile_pattern_working+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
          gl_cv_func_re_compile_pattern_working=no
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <regex.h>
 
@@ -24239,133 +34068,404 @@ int result = 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_re_compile_pattern_working=yes
 else
-  gl_cv_func_re_compile_pattern_working=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_re_compile_pattern_working=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_re_compile_pattern_working" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_working" >&5
 $as_echo "$gl_cv_func_re_compile_pattern_working" >&6; }
     case $gl_cv_func_re_compile_pattern_working in #(
     yes) ac_use_included_regex=no;; #(
     no) ac_use_included_regex=yes;;
     esac
     ;;
-  *) as_fn_error $? "Invalid value for --with-included-regex: $with_included_regex" "$LINENO" 5
+  *) { { $as_echo "$as_me:$LINENO: error: Invalid value for --with-included-regex: $with_included_regex" >&5
+$as_echo "$as_me: error: Invalid value for --with-included-regex: $with_included_regex" >&2;}
+   { (exit 1); exit 1; }; }
     ;;
   esac
 
   if test $ac_use_included_regex = yes; then
 
-$as_echo "#define _REGEX_INCLUDE_LIMITS_H 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REGEX_INCLUDE_LIMITS_H 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _REGEX_LARGE_OFFSETS 1
+_ACEOF
+
 
+cat >>confdefs.h <<\_ACEOF
+#define re_syntax_options rpl_re_syntax_options
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_set_syntax rpl_re_set_syntax
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_compile_pattern rpl_re_compile_pattern
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_compile_fastmap rpl_re_compile_fastmap
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_search rpl_re_search
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_search_2 rpl_re_search_2
+_ACEOF
 
-$as_echo "#define _REGEX_LARGE_OFFSETS 1" >>confdefs.h
+
+cat >>confdefs.h <<\_ACEOF
+#define re_match rpl_re_match
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_match_2 rpl_re_match_2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_set_registers rpl_re_set_registers
+_ACEOF
 
 
-$as_echo "#define re_syntax_options rpl_re_syntax_options" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define re_comp rpl_re_comp
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define re_exec rpl_re_exec
+_ACEOF
 
 
-$as_echo "#define re_set_syntax rpl_re_set_syntax" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define regcomp rpl_regcomp
+_ACEOF
+
 
+cat >>confdefs.h <<\_ACEOF
+#define regexec rpl_regexec
+_ACEOF
 
-$as_echo "#define re_compile_pattern rpl_re_compile_pattern" >>confdefs.h
 
+cat >>confdefs.h <<\_ACEOF
+#define regerror rpl_regerror
+_ACEOF
 
-$as_echo "#define re_compile_fastmap rpl_re_compile_fastmap" >>confdefs.h
 
+cat >>confdefs.h <<\_ACEOF
+#define regfree rpl_regfree
+_ACEOF
 
-$as_echo "#define re_search rpl_re_search" >>confdefs.h
+  fi
 
+  if test $ac_use_included_regex = yes; then
 
-$as_echo "#define re_search_2 rpl_re_search_2" >>confdefs.h
 
 
-$as_echo "#define re_match rpl_re_match" >>confdefs.h
 
 
-$as_echo "#define re_match_2 rpl_re_match_2" >>confdefs.h
 
 
-$as_echo "#define re_set_registers rpl_re_set_registers" >>confdefs.h
 
+  gl_LIBOBJS="$gl_LIBOBJS regex.$ac_objext"
 
-$as_echo "#define re_comp rpl_re_comp" >>confdefs.h
 
 
-$as_echo "#define re_exec rpl_re_exec" >>confdefs.h
 
 
-$as_echo "#define regcomp rpl_regcomp" >>confdefs.h
 
 
-$as_echo "#define regexec rpl_regexec" >>confdefs.h
 
 
-$as_echo "#define regerror rpl_regerror" >>confdefs.h
+for ac_header in libintl.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_header_compiler=no
+fi
 
-$as_echo "#define regfree rpl_regfree" >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
-  fi
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  if test $ac_use_included_regex = yes; then
+  ac_header_preproc=no
+fi
 
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## --------------------------------------- ##
+## Report this to opendap-tech at opendap.org ##
+## --------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
 
 
-  gl_LIBOBJS="$gl_LIBOBJS regex.$ac_objext"
 
 
 
 
 
 
+  { $as_echo "$as_me:$LINENO: checking whether isblank is declared" >&5
+$as_echo_n "checking whether isblank is declared... " >&6; }
+if test "${ac_cv_have_decl_isblank+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
 
+int
+main ()
+{
+#ifndef isblank
+  (void) isblank;
+#endif
 
-  for ac_header in libintl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBINTL_H 1
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_isblank=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_have_decl_isblank=no
 fi
 
-done
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_isblank" >&5
+$as_echo "$ac_cv_have_decl_isblank" >&6; }
+if test "x$ac_cv_have_decl_isblank" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISBLANK 1
+_ACEOF
 
 
-  ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h>
-"
-if test "x$ac_cv_have_decl_isblank" = xyes; then :
-  ac_have_decl=1
 else
-  ac_have_decl=0
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISBLANK 0
+_ACEOF
+
+
 fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_ISBLANK $ac_have_decl
-_ACEOF
 
 
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
+  { $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
 $as_echo_n "checking for ssize_t... " >&6; }
-if ${gt_cv_ssize_t+:} false; then :
+if test "${gt_cv_ssize_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -24377,18 +34477,41 @@ int x = sizeof (ssize_t *) + sizeof (ssize_t);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gt_cv_ssize_t=yes
 else
-  gt_cv_ssize_t=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gt_cv_ssize_t=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
 $as_echo "$gt_cv_ssize_t" >&6; }
   if test $gt_cv_ssize_t = no; then
 
-$as_echo "#define ssize_t int" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define ssize_t int
+_ACEOF
 
   fi
 
@@ -24423,11 +34546,106 @@ fi
 
 
   STDDEF_H=
-  ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "#include <stddef.h>
+  { $as_echo "$as_me:$LINENO: checking for max_align_t" >&5
+$as_echo_n "checking for max_align_t... " >&6; }
+if test "${ac_cv_type_max_align_t+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_max_align_t=no
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
 
-"
-if test "x$ac_cv_type_max_align_t" = xyes; then :
 
+int
+main ()
+{
+if (sizeof (max_align_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stddef.h>
+
+
+int
+main ()
+{
+if (sizeof ((max_align_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_max_align_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_max_align_t" >&5
+$as_echo "$ac_cv_type_max_align_t" >&6; }
+if test "x$ac_cv_type_max_align_t" = x""yes; then
+  :
 else
   HAVE_MAX_ALIGN_T=0; STDDEF_H=stddef.h
 fi
@@ -24436,12 +34654,16 @@ fi
     HAVE_WCHAR_T=0
     STDDEF_H=stddef.h
   fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
+  { $as_echo "$as_me:$LINENO: checking whether NULL can be used in arbitrary expressions" >&5
 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+if test "${gl_cv_decl_null_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stddef.h>
       int test[2 * (sizeof NULL == sizeof (void *)) -1];
@@ -24454,14 +34676,35 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_decl_null_works=yes
 else
-  gl_cv_decl_null_works=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_decl_null_works=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_decl_null_works" >&5
 $as_echo "$gl_cv_decl_null_works" >&6; }
   if test $gl_cv_decl_null_works = no; then
     REPLACE_NULL=1
@@ -24488,15 +34731,19 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stddef_h='<'stddef.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stddef.h>" >&5
 $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+if test "${gl_cv_next_stddef_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stddef.h>
 _ACEOF
@@ -24531,7 +34778,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stddef_h" >&5
 $as_echo "$gl_cv_next_stddef_h" >&6; }
      fi
      NEXT_STDDEF_H=$gl_cv_next_stddef_h
@@ -24564,15 +34811,19 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_stdlib_h='<'stdlib.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <stdlib.h>" >&5
 $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
+if test "${gl_cv_next_stdlib_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 _ACEOF
@@ -24607,7 +34858,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdlib_h" >&5
 $as_echo "$gl_cv_next_stdlib_h" >&6; }
      fi
      NEXT_STDLIB_H=$gl_cv_next_stdlib_h
@@ -24626,14 +34877,49 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; }
 
 
 
-    for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt     initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps     posix_openpt ptsname ptsname_r random random_r realpath rpmatch     secure_getenv setenv setstate setstate_r srandom srandom_r     strtod strtoll strtoull unlockpt unsetenv; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #if HAVE_SYS_LOADAVG_H
@@ -24652,24 +34938,95 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
+_ACEOF
+
+                     eval ac_cv_have_decl_$gl_func=yes
+fi
+
+      done
+
+
+
+  { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+done
+IFS=$as_save_IFS
+
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
-_ACEOF
 
-                     eval ac_cv_have_decl_$gl_func=yes
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    test -d ./--version && rmdir ./--version
+    MKDIR_P="$ac_install_sh -d"
+  fi
 fi
-      done
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+
 
 
 
@@ -24693,9 +35050,9 @@ fi
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_unistd_h='<'unistd.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <unistd.h>" >&5
 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if ${gl_cv_next_unistd_h+:} false; then :
+if test "${gl_cv_next_unistd_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -24704,7 +35061,11 @@ else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <unistd.h>
 _ACEOF
@@ -24742,7 +35103,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_unistd_h" >&5
 $as_echo "$gl_cv_next_unistd_h" >&6; }
      fi
      NEXT_UNISTD_H=$gl_cv_next_unistd_h
@@ -24771,14 +35132,63 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
 
 
 
-    for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups     gethostname getlogin getlogin_r getpagesize     getusershell setusershell endusershell     group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite     readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r     unlink unlinkat usleep; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -24803,23 +35213,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
                      eval ac_cv_have_decl_$gl_func=yes
 fi
+
       done
 
 
@@ -24835,12 +35270,17 @@ fi
 
 
 
+
+
+
+
+
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wchar_h='<'wchar.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wchar.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <wchar.h>" >&5
 $as_echo_n "checking absolute name of <wchar.h>... " >&6; }
-if ${gl_cv_next_wchar_h+:} false; then :
+if test "${gl_cv_next_wchar_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -24849,7 +35289,11 @@ else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <wchar.h>
 _ACEOF
@@ -24887,7 +35331,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wchar_h" >&5
 $as_echo "$gl_cv_next_wchar_h" >&6; }
      fi
      NEXT_WCHAR_H=$gl_cv_next_wchar_h
@@ -24922,14 +35366,57 @@ $as_echo "$gl_cv_next_wchar_h" >&6; }
 
 
 
-    for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset      wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp      wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr      wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth     ; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -24952,23 +35439,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
                      eval ac_cv_have_decl_$gl_func=yes
 fi
+
       done
 
 
@@ -24982,13 +35494,23 @@ fi
 
 
 
+
+
+
+
+
+
+
+
+
+
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc handles incomplete characters" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5
 $as_echo_n "checking whether mbrtowc handles incomplete characters... " >&6; }
-if ${gl_cv_func_mbrtowc_incomplete_state+:} false; then :
+if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -24999,10 +35521,14 @@ else
         *)           gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;;
       esac
       if test $LOCALE_JA != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -25031,27 +35557,54 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_incomplete_state=yes
 else
-  gl_cv_func_mbrtowc_incomplete_state=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_incomplete_state=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5
 $as_echo "$gl_cv_func_mbrtowc_incomplete_state" >&6; }
 
 
 
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc works as well as mbtowc" >&5
+     { $as_echo "$as_me:$LINENO: checking whether mbrtowc works as well as mbtowc" >&5
 $as_echo_n "checking whether mbrtowc works as well as mbtowc... " >&6; }
-if ${gl_cv_func_mbrtowc_sanitycheck+:} false; then :
+if test "${gl_cv_func_mbrtowc_sanitycheck+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -25062,10 +35615,14 @@ else
         *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
       esac
       if test $LOCALE_ZH_CN != none; then
-        if test "$cross_compiling" = yes; then :
+        if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -25098,19 +35655,46 @@ int main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_mbrtowc_sanitycheck=yes
 else
-  gl_cv_func_mbrtowc_sanitycheck=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_mbrtowc_sanitycheck=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
       fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_sanitycheck" >&5
 $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
     REPLACE_MBSTATE_T=0
@@ -25128,28 +35712,91 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
-  if test $ac_cv_func_wcrtomb = no; then
-    HAVE_WCRTOMB=0
-    ac_fn_c_check_decl "$LINENO" "wcrtomb" "ac_cv_have_decl_wcrtomb" "
-/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-   <wchar.h>.
-   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
-   included before <wchar.h>.  */
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
 
-"
-if test "x$ac_cv_have_decl_wcrtomb" = xyes; then :
-  ac_have_decl=1
-else
-  ac_have_decl=0
+
+
+
+
+  if test $ac_cv_func_wcrtomb = no; then
+    HAVE_WCRTOMB=0
+    { $as_echo "$as_me:$LINENO: checking whether wcrtomb is declared" >&5
+$as_echo_n "checking whether wcrtomb is declared... " >&6; }
+if test "${ac_cv_have_decl_wcrtomb+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+
+
+int
+main ()
+{
+#ifndef wcrtomb
+  (void) wcrtomb;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_wcrtomb=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_wcrtomb=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_wcrtomb" >&5
+$as_echo "$ac_cv_have_decl_wcrtomb" >&6; }
+if test "x$ac_cv_have_decl_wcrtomb" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WCRTOMB 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_WCRTOMB 0
+_ACEOF
+
+
 fi
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_WCRTOMB $ac_have_decl
-_ACEOF
 
     if test $ac_cv_have_decl_wcrtomb = yes; then
                         REPLACE_WCRTOMB=1
@@ -25163,9 +35810,9 @@ _ACEOF
 
 
 
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether wcrtomb return value is correct" >&5
+             { $as_echo "$as_me:$LINENO: checking whether wcrtomb return value is correct" >&5
 $as_echo_n "checking whether wcrtomb return value is correct... " >&6; }
-if ${gl_cv_func_wcrtomb_retval+:} false; then :
+if test "${gl_cv_func_wcrtomb_retval+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -25176,10 +35823,14 @@ else
             *)                       gl_cv_func_wcrtomb_retval="guessing yes" ;;
           esac
           if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
-            if test "$cross_compiling" = yes; then :
+            if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 #include <locale.h>
@@ -25218,19 +35869,46 @@ int main ()
   return result;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_wcrtomb_retval=yes
 else
-  gl_cv_func_wcrtomb_retval=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_wcrtomb_retval=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+
           fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_wcrtomb_retval" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_wcrtomb_retval" >&5
 $as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
       case "$gl_cv_func_wcrtomb_retval" in
         *yes) ;;
@@ -25265,7 +35943,14 @@ $as_echo "$gl_cv_func_wcrtomb_retval" >&6; }
 
 
 
-$as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define GNULIB_TEST_WCRTOMB 1
+_ACEOF
+
+
+
+
+
 
 
 
@@ -25298,12 +35983,17 @@ $as_echo "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h
 
 
 
+
+
+
+
+
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_wctype_h='<'wctype.h'>'
      else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <wctype.h>" >&5
+       { $as_echo "$as_me:$LINENO: checking absolute name of <wctype.h>" >&5
 $as_echo_n "checking absolute name of <wctype.h>... " >&6; }
-if ${gl_cv_next_wctype_h+:} false; then :
+if test "${gl_cv_next_wctype_h+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
@@ -25312,7 +36002,11 @@ else
 
 
 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <wctype.h>
 _ACEOF
@@ -25350,7 +36044,7 @@ _ACEOF
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wctype_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5
 $as_echo "$gl_cv_next_wctype_h" >&6; }
      fi
      NEXT_WCTYPE_H=$gl_cv_next_wctype_h
@@ -25369,14 +36063,18 @@ $as_echo "$gl_cv_next_wctype_h" >&6; }
 
   if test $ac_cv_header_wctype_h = yes; then
     if test $ac_cv_func_iswcntrl = yes; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iswcntrl works" >&5
+                  { $as_echo "$as_me:$LINENO: checking whether iswcntrl works" >&5
 $as_echo_n "checking whether iswcntrl works... " >&6; }
-if ${gl_cv_func_iswcntrl_works+:} false; then :
+if test "${gl_cv_func_iswcntrl_works+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
 
-          if test "$cross_compiling" = yes; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test "$cross_compiling" = yes; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
                           #if __GNU_LIBRARY__ == 1
@@ -25390,15 +36088,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_func_iswcntrl_works="guessing yes"
 else
-  gl_cv_func_iswcntrl_works="guessing no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_func_iswcntrl_works="guessing no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
                /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
@@ -25413,18 +36136,45 @@ else
                int main () { return iswprint ('x') == 0; }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   gl_cv_func_iswcntrl_works=yes
 else
-  gl_cv_func_iswcntrl_works=no
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gl_cv_func_iswcntrl_works=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_iswcntrl_works" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_iswcntrl_works" >&5
 $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
     fi
     HAVE_WCTYPE_H=1
@@ -25446,12 +36196,102 @@ $as_echo "$gl_cv_func_iswcntrl_works" >&6; }
   if test $REPLACE_ISWCNTRL = 1; then
     REPLACE_TOWLOWER=1
   else
-    for ac_func in towlower
-do :
-  ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower"
-if test "x$ac_cv_func_towlower" = xyes; then :
+
+for ac_func in towlower
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_TOWLOWER 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -25460,7 +36300,18 @@ done
     if test $ac_cv_func_towlower = yes; then
       REPLACE_TOWLOWER=0
     else
-      ac_fn_c_check_decl "$LINENO" "towlower" "ac_cv_have_decl_towlower" "/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
+      { $as_echo "$as_me:$LINENO: checking whether towlower is declared" >&5
+$as_echo_n "checking whether towlower is declared... " >&6; }
+if test "${ac_cv_have_decl_towlower+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
              included before <wchar.h>.
              BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h>
              must be included before <wchar.h>.  */
@@ -25472,17 +36323,64 @@ done
           # include <wctype.h>
           #endif
 
-"
-if test "x$ac_cv_have_decl_towlower" = xyes; then :
-  ac_have_decl=1
+
+int
+main ()
+{
+#ifndef towlower
+  (void) towlower;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl_towlower=yes
 else
-  ac_have_decl=0
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl_towlower=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_towlower" >&5
+$as_echo "$ac_cv_have_decl_towlower" >&6; }
+if test "x$ac_cv_have_decl_towlower" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TOWLOWER $ac_have_decl
+#define HAVE_DECL_TOWLOWER 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TOWLOWER 0
 _ACEOF
 
+
+fi
+
+
       if test $ac_cv_have_decl_towlower = yes; then
                                 REPLACE_TOWLOWER=1
       else
@@ -25496,12 +36394,16 @@ _ACEOF
         :
   fi
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctype_t" >&5
+          { $as_echo "$as_me:$LINENO: checking for wctype_t" >&5
 $as_echo_n "checking for wctype_t... " >&6; }
-if ${gl_cv_type_wctype_t+:} false; then :
+if test "${gl_cv_type_wctype_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
                included before <wchar.h>.
@@ -25524,26 +36426,51 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_type_wctype_t=yes
 else
-  gl_cv_type_wctype_t=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_type_wctype_t=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctype_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctype_t" >&5
 $as_echo "$gl_cv_type_wctype_t" >&6; }
   if test $gl_cv_type_wctype_t = no; then
     HAVE_WCTYPE_T=0
   fi
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wctrans_t" >&5
+      { $as_echo "$as_me:$LINENO: checking for wctrans_t" >&5
 $as_echo_n "checking for wctrans_t... " >&6; }
-if ${gl_cv_type_wctrans_t+:} false; then :
+if test "${gl_cv_type_wctrans_t+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be
                included before <wchar.h>.
@@ -25564,29 +36491,58 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   gl_cv_type_wctrans_t=yes
 else
-  gl_cv_type_wctrans_t=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	gl_cv_type_wctrans_t=no
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wctrans_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctrans_t" >&5
 $as_echo "$gl_cv_type_wctrans_t" >&6; }
   if test $gl_cv_type_wctrans_t = no; then
     HAVE_WCTRANS_T=0
   fi
 
 
-    for gl_func in wctype iswctype wctrans towctrans     ; do
+
+
+
+
+  for gl_func in wctype iswctype wctrans towctrans     ; do
     as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5
+    { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5
 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; }
-if eval \${$as_gl_Symbol+:} false; then :
+if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
@@ -25610,23 +36566,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_gl_Symbol=yes"
 else
-  eval "$as_gl_Symbol=no"
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_gl_Symbol=no"
 fi
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-eval ac_res=\$$as_gl_Symbol
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ac_res=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-    if eval test \"x\$"$as_gl_Symbol"\" = x"yes"; then :
+    as_val=`eval 'as_val=${'$as_gl_Symbol'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1
 _ACEOF
 
                      eval ac_cv_have_decl_$gl_func=yes
 fi
+
       done
 
 
@@ -25668,7 +36649,7 @@ fi
 
 
 # Check whether --with-curl was given.
-if test "${with_curl+set}" = set; then :
+if test "${with_curl+set}" = set; then
   withval=$with_curl; with_curl_prefix="$withval"
 else
   with_curl_prefix=""
@@ -25682,7 +36663,7 @@ curl_set=
 
 if test -n "$with_curl_prefix" -a -x $with_curl_prefix/bin/curl-config
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Using $with_curl_prefix as the curl prefix directory." >&5
+    { $as_echo "$as_me:$LINENO: Using $with_curl_prefix as the curl prefix directory." >&5
 $as_echo "$as_me: Using $with_curl_prefix as the curl prefix directory." >&6;}
     CURL_LIBS="`$with_curl_prefix/bin/curl-config --libs`"
     CURL_STATIC_LIBS=$CURL_LIBS
@@ -25691,7 +36672,9 @@ $as_echo "$as_me: Using $with_curl_prefix as the curl prefix directory." >&6;}
     curl_set="yes"
 elif test -n "$with_curl_prefix"
 then
-    as_fn_error $? "You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." >&5
+$as_echo "$as_me: error: You set the curl-prefix directory to $with_curl_prefix, but curl-config is not there." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test -z "$curl_set"
@@ -25706,9 +36689,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -25721,14 +36704,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -25736,10 +36719,10 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -25749,9 +36732,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -25764,14 +36747,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   ;;
@@ -25779,10 +36762,10 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -25791,7 +36774,7 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -25804,13 +36787,13 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
@@ -25818,7 +36801,7 @@ $as_echo "no" >&6; }
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
+{ $as_echo "$as_me:$LINENO: checking for CURL" >&5
 $as_echo_n "checking for CURL... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -25826,11 +36809,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\"") >&5
   ($PKG_CONFIG --exists --print-errors "$libdap_libcurl_module") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libcurl_module" 2>/dev/null`
 else
   pkg_failed=yes
@@ -25844,11 +36827,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_CURL_LIBS="$CURL_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libcurl_module\"") >&5
   ($PKG_CONFIG --exists --print-errors "$libdap_libcurl_module") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "$libdap_libcurl_module" 2>/dev/null`
 else
   pkg_failed=yes
@@ -25875,7 +36858,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CURL_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
                 libdap_pkgconfig_libcurl=no
 elif test $pkg_failed = untried; then
@@ -25883,18 +36866,18 @@ elif test $pkg_failed = untried; then
 else
 	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
 	CURL_LIBS=$pkg_cv_CURL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
+    { $as_echo "$as_me:$LINENO: checking for libcurl" >&5
 $as_echo_n "checking for libcurl... " >&6; }
 
     if test $libdap_pkgconfig_libcurl = 'yes'
     then
 	   curlprivatereq=$libdap_libcurl_module
 	   CURL_STATIC_LIBS="`$PKG_CONFIG --static --libs libcurl`"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used pkg-config" >&5
+	   { $as_echo "$as_me:$LINENO: result: yes; used pkg-config" >&5
 $as_echo "yes; used pkg-config" >&6; }
     elif curl-config --version > /dev/null 2>&1
     then
@@ -25903,25 +36886,24 @@ $as_echo "yes; used pkg-config" >&6; }
        as_arg_v1="$version_libcurl"
 as_arg_v2="7.19.0"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    as_fn_error $? "I could not find libcurl 7.19.0 or newer, found $version_libcurl" "$LINENO" 5 ;; #(
-  0) :
-     ;; #(
-  2) :
-     ;; #(
-  *) :
-     ;;
+case $? in
+1) { { $as_echo "$as_me:$LINENO: error: I could not find libcurl 7.19.0 or newer, found $version_libcurl" >&5
+$as_echo "$as_me: error: I could not find libcurl 7.19.0 or newer, found $version_libcurl" >&2;}
+   { (exit 1); exit 1; }; };;
+0) ;;
+2) ;;
 esac
 
 	   CURL_LIBS="`curl-config --libs`"
 	   CURL_STATIC_LIBS=$CURL_LIBS
 	   curlprivatelibs="`curl-config --libs`"
 	   CURL_CFLAGS="`curl-config --cflags`"
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used curl-config and found version $version_libcurl" >&5
+	   { $as_echo "$as_me:$LINENO: result: yes; used curl-config and found version $version_libcurl" >&5
 $as_echo "yes; used curl-config and found version $version_libcurl" >&6; }
     else
-	   as_fn_error $? "I could not find libcurl" "$LINENO" 5
+	   { { $as_echo "$as_me:$LINENO: error: I could not find libcurl" >&5
+$as_echo "$as_me: error: I could not find libcurl" >&2;}
+   { (exit 1); exit 1; }; }
     fi
 fi
 
@@ -25933,7 +36915,7 @@ fi
 
 
 # Check whether --with-xml2 was given.
-if test "${with_xml2+set}" = set; then :
+if test "${with_xml2+set}" = set; then
   withval=$with_xml2; with_xml2_prefix="$withval"
 else
   with_xml2_prefix=""
@@ -25946,7 +36928,7 @@ xml_set=
 
 if test -n "$with_xml2_prefix" -a -x $with_xml2_prefix/bin/xml2-config
 then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Using $with_xml2_prefix as the libxml2 prefix directory." >&5
+    { $as_echo "$as_me:$LINENO: Using $with_xml2_prefix as the libxml2 prefix directory." >&5
 $as_echo "$as_me: Using $with_xml2_prefix as the libxml2 prefix directory." >&6;}
     XML2_LIBS="`$with_xml2_prefix/bin/xml2-config --libs`"
         xmlprivatelibs="`$with_xml2_prefix/bin/xml2-config --libs`"
@@ -25954,7 +36936,9 @@ $as_echo "$as_me: Using $with_xml2_prefix as the libxml2 prefix directory." >&6;
     xml_set="yes"
 elif test -n "$with_xml2_prefix"
 then
-    as_fn_error $? "You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." >&5
+$as_echo "$as_me: error: You set the libxml2 prefix directory to $with_xml2_prefix, but xml2-config is not there." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test -z "$xml_set"
@@ -25963,7 +36947,7 @@ libdap_pkgconfig_libxml2=yes
 libdap_libxml2_module='libxml-2.0 >= 2.7.0'
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML2" >&5
+{ $as_echo "$as_me:$LINENO: checking for XML2" >&5
 $as_echo_n "checking for XML2... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -25971,11 +36955,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XML2_CFLAGS="$XML2_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\"") >&5
   ($PKG_CONFIG --exists --print-errors "$libdap_libxml2_module") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_XML2_CFLAGS=`$PKG_CONFIG --cflags "$libdap_libxml2_module" 2>/dev/null`
 else
   pkg_failed=yes
@@ -25989,11 +36973,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XML2_LIBS="$XML2_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$libdap_libxml2_module\"") >&5
   ($PKG_CONFIG --exists --print-errors "$libdap_libxml2_module") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_XML2_LIBS=`$PKG_CONFIG --libs "$libdap_libxml2_module" 2>/dev/null`
 else
   pkg_failed=yes
@@ -26020,7 +37004,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XML2_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
                 libdap_pkgconfig_libxml2=no
 elif test $pkg_failed = untried; then
@@ -26028,17 +37012,17 @@ elif test $pkg_failed = untried; then
 else
 	XML2_CFLAGS=$pkg_cv_XML2_CFLAGS
 	XML2_LIBS=$pkg_cv_XML2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml2" >&5
+{ $as_echo "$as_me:$LINENO: checking for libxml2" >&5
 $as_echo_n "checking for libxml2... " >&6; }
 if test $libdap_pkgconfig_libxml2 = 'yes'
 then
 	xmlprivatereq=$libdap_libxml2_module
 		XML2_LIBS="`$PKG_CONFIG --libs libxml-2.0`"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used pkg-config" >&5
+	{ $as_echo "$as_me:$LINENO: result: yes; used pkg-config" >&5
 $as_echo "yes; used pkg-config" >&6; }
 elif xml2-config --version > /dev/null 2>&1
 then
@@ -26047,24 +37031,23 @@ then
         as_arg_v1="$version_libxml2"
 as_arg_v2="2.7.0"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    as_fn_error $? "I could not find libxml2 2.7.0 or newer" "$LINENO" 5 ;; #(
-  0) :
-     ;; #(
-  2) :
-     ;; #(
-  *) :
-     ;;
+case $? in
+1) { { $as_echo "$as_me:$LINENO: error: I could not find libxml2 2.7.0 or newer" >&5
+$as_echo "$as_me: error: I could not find libxml2 2.7.0 or newer" >&2;}
+   { (exit 1); exit 1; }; };;
+0) ;;
+2) ;;
 esac
 
 	XML2_LIBS="`xml2-config --libs`"
 		XML2_CFLAGS="`xml2-config --cflags`"
 	xmlprivatelibs="`xml2-config --libs `"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; used xml2-config and found version $version_libxml2" >&5
+		{ $as_echo "$as_me:$LINENO: result: yes; used xml2-config and found version $version_libxml2" >&5
 $as_echo "yes; used xml2-config and found version $version_libxml2" >&6; }
 else
-	as_fn_error $? "I could not find ml2-config" "$LINENO" 5
+	{ { $as_echo "$as_me:$LINENO: error: I could not find ml2-config" >&5
+$as_echo "$as_me: error: I could not find ml2-config" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 fi
 
@@ -26073,14 +37056,18 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -lpthread" >&5
+{ $as_echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
 $as_echo_n "checking for pthread_kill in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_kill+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26098,33 +37085,64 @@ return pthread_kill ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_kill=yes
 else
-  ac_cv_lib_pthread_pthread_kill=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pthread_pthread_kill=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_kill" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_kill" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_kill" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_kill" = x""yes; then
   PTHREAD_LIBS="-lpthread"
 else
-  as_fn_error $? "I could not find pthreads" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: I could not find pthreads" >&5
+$as_echo "$as_me: error: I could not find pthreads" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+{ $as_echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
 $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
-if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26142,18 +37160,43 @@ return uuid_generate ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_uuid_uuid_generate=yes
 else
-  ac_cv_lib_uuid_uuid_generate=no
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_uuid_uuid_generate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then
   UUID_LIBS="-luuid"
 else
   UUID_LIBS=""
@@ -26165,7 +37208,7 @@ fi
 
 
 # Check whether --with-cppunit-prefix was given.
-if test "${with_cppunit_prefix+set}" = set; then :
+if test "${with_cppunit_prefix+set}" = set; then
   withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
 else
   cppunit_config_prefix=""
@@ -26173,7 +37216,7 @@ fi
 
 
 # Check whether --with-cppunit-exec-prefix was given.
-if test "${with_cppunit_exec_prefix+set}" = set; then :
+if test "${with_cppunit_exec_prefix+set}" = set; then
   withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
 else
   cppunit_config_exec_prefix=""
@@ -26195,9 +37238,9 @@ fi
 
   # Extract the first word of "cppunit-config", so it can be a program name with args.
 set dummy cppunit-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
+if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   case $CPPUNIT_CONFIG in
@@ -26210,14 +37253,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
@@ -26226,21 +37269,21 @@ esac
 fi
 CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
 if test -n "$CPPUNIT_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $CPPUNIT_CONFIG" >&5
 $as_echo "$CPPUNIT_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   cppunit_version_min=1.12.0
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
+  { $as_echo "$as_me:$LINENO: checking for Cppunit - version >= $cppunit_version_min" >&5
 $as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
   no_cppunit=""
   if test "$CPPUNIT_CONFIG" = "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
     no_cppunit=yes
   else
@@ -26282,10 +37325,10 @@ $as_echo "no" >&6; }
         $cppunit_micro_version \>= $cppunit_micro_min `
 
     if test "$cppunit_version_proper" = "1" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
+      { $as_echo "$as_me:$LINENO: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
 $as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
     else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
       no_cppunit=yes
     fi
@@ -26306,7 +37349,7 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPPUNIT" >&5
+{ $as_echo "$as_me:$LINENO: checking for CPPUNIT" >&5
 $as_echo_n "checking for CPPUNIT... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
@@ -26314,11 +37357,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "cppunit >= 1.12.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -26332,11 +37375,11 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_CPPUNIT_LIBS="$CPPUNIT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\""; } >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cppunit >= 1.12.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "cppunit >= 1.12.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.0" 2>/dev/null`
 else
   pkg_failed=yes
@@ -26363,7 +37406,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CPPUNIT_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
                  if false; then
   CPPUNIT_TRUE=
@@ -26387,7 +37430,7 @@ fi
 else
 	CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS
 	CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	 if true; then
   CPPUNIT_TRUE=
@@ -26407,7 +37450,7 @@ fi
 
 
     # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
+if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; DEBUG=$enableval
 else
   DEBUG=no
@@ -26418,29 +37461,39 @@ fi
     no)
       ;;
     1)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 1" >&5
+      { $as_echo "$as_me:$LINENO: result: Setting debugging to level 1" >&5
 $as_echo "Setting debugging to level 1" >&6; }
-      $as_echo "#define DODS_DEBUG 1" >>confdefs.h
+      cat >>confdefs.h <<\_ACEOF
+#define DODS_DEBUG 1
+_ACEOF
 
       ;;
     2)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting debugging to level 2" >&5
+      { $as_echo "$as_me:$LINENO: result: Setting debugging to level 2" >&5
 $as_echo "Setting debugging to level 2" >&6; }
 
-$as_echo "#define DODS_DEBUG /**/" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define DODS_DEBUG /**/
+_ACEOF
 
 
-$as_echo "#define DODS_DEBUG2 /**/" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define DODS_DEBUG2 /**/
+_ACEOF
 
       ;;
     *)
-      as_fn_error $? "Bad debug value" "$LINENO" 5
+      { { $as_echo "$as_me:$LINENO: error: Bad debug value" >&5
+$as_echo "$as_me: error: Bad debug value" >&2;}
+   { (exit 1); exit 1; }; }
       ;;
     esac
 
-if test "$prefix" = "NONE"; then :
+if test "$prefix" = "NONE"; then
 
-$as_echo "#define LIBDAP_ROOT \"/usr/local\"" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define LIBDAP_ROOT "/usr/local"
+_ACEOF
 
 else
 
@@ -26450,18 +37503,21 @@ _ACEOF
 
 fi
 
+
 # Check whether --enable-dap4 was given.
-if test "${enable_dap4+set}" = set; then :
+if test "${enable_dap4+set}" = set; then
   enableval=$enable_dap4; enable_dap4=${enableval}
 else
   enable_dap4=yes
 fi
 
 
-if test x$enable_dap4 = xyes; then :
+if test x$enable_dap4 = xyes; then
 
 
-$as_echo "#define DAP4 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define DAP4 1
+_ACEOF
 
      if true; then
   DAP4_DEFINED_TRUE=
@@ -26483,16 +37539,17 @@ fi
 
 fi
 
+
 # Check whether --enable-developer was given.
-if test "${enable_developer+set}" = set; then :
+if test "${enable_developer+set}" = set; then
   enableval=$enable_developer; build_developer=${enableval}
 else
   build_developer=no
 fi
 
 
-if test x$build_developer = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Building developer version" >&5
+if test x$build_developer = xyes; then
+  { $as_echo "$as_me:$LINENO: Building developer version" >&5
 $as_echo "$as_me: Building developer version" >&6;}
         if true; then
   BUILD_DEVELOPER_TRUE=
@@ -26503,7 +37560,7 @@ else
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Not building developer version" >&5
+  { $as_echo "$as_me:$LINENO: Not building developer version" >&5
 $as_echo "$as_me: Not building developer version" >&6;}
         if false; then
   BUILD_DEVELOPER_TRUE=
@@ -26514,49 +37571,56 @@ else
 fi
 
 
-$as_echo "#define NDEBUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
 
 fi
 
 
 
+
 # Check whether --enable-coverage was given.
-if test "${enable_coverage+set}" = set; then :
+if test "${enable_coverage+set}" = set; then
   enableval=$enable_coverage; coverage=$enableval
 else
   coverage=no
 fi
 
 
-if test x$coverage = xyes; then :
-   if test x$GCC = xyes; then :
+if test x$coverage = xyes; then
+   if test x$GCC = xyes; then
    CFLAGS="-fprofile-arcs -ftest-coverage -pg $CFLAGS"
               CXXFLAGS="-fprofile-arcs -ftest-coverage -pg $CXXFLAGS"
               LDFLAGS="-pg $LDFLAGS"
-	          { $as_echo "$as_me:${as_lineno-$LINENO}: Building coverage reporting." >&5
+	          { $as_echo "$as_me:$LINENO: Building coverage reporting." >&5
 $as_echo "$as_me: Building coverage reporting." >&6;}
 else
-   as_fn_error $? "Can only enable coverage when using gcc." "$LINENO" 5
+   { { $as_echo "$as_me:$LINENO: error: Can only enable coverage when using gcc." >&5
+$as_echo "$as_me: error: Can only enable coverage when using gcc." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 fi
 
+
 # Support for running test cases using valgrind:
 
 use_valgrind=no
 # Check whether --enable-valgrind was given.
-if test "${enable_valgrind+set}" = set; then :
+if test "${enable_valgrind+set}" = set; then
   enableval=$enable_valgrind; use_valgrind=$enableval
 else
   use_valgrind=no
 fi
 
 
-if test x$use_valgrind = xyes ; then :
+if test x$use_valgrind = xyes ; then
    # Extract the first word of "valgrind", so it can be a program name with args.
 set dummy valgrind; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_VALGRIND+:} false; then :
+if test "${ac_cv_prog_HAVE_VALGRIND+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   if test -n "$HAVE_VALGRIND"; then
@@ -26567,14 +37631,14 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_HAVE_VALGRIND="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
+done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_HAVE_VALGRIND" && ac_cv_prog_HAVE_VALGRIND="no"
@@ -26582,22 +37646,26 @@ fi
 fi
 HAVE_VALGRIND=$ac_cv_prog_HAVE_VALGRIND
 if test -n "$HAVE_VALGRIND"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_VALGRIND" >&5
+  { $as_echo "$as_me:$LINENO: result: $HAVE_VALGRIND" >&5
 $as_echo "$HAVE_VALGRIND" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-        if test x$HAVE_VALGRIND = xyes ; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Using valgrind with unit tests." >&5
+        if test x$HAVE_VALGRIND = xyes ; then
+  { $as_echo "$as_me:$LINENO: Using valgrind with unit tests." >&5
 $as_echo "$as_me: Using valgrind with unit tests." >&6;}
 else
-  as_fn_error $? "Valgrind not found in PATH." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: Valgrind not found in PATH." >&5
+$as_echo "$as_me: error: Valgrind not found in PATH." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 fi
 
+
  if test x$use_valgrind = xyes; then
   USE_VALGRIND_TRUE=
   USE_VALGRIND_FALSE='#'
@@ -26614,6 +37682,8 @@ fi
 
 
 
+
+
 ac_config_files="$ac_config_files Makefile libdap.pc libdapclient.pc libdapserver.pc main_page.doxygen doxy.conf abi_checker.xml gl/Makefile d4_ce/Makefile d4_function/Makefile tests/Makefile tests/atlocal unit-tests/Makefile unit-tests/cache-testsuite/Makefile"
 
 
@@ -26647,13 +37717,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
+      *) $as_unset $ac_var ;;
       esac ;;
     esac
   done
@@ -26661,8 +37731,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -26684,23 +37754,12 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+    cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
@@ -26714,15 +37773,14 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -26738,61 +37796,103 @@ else
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${COMPILER_IS_GCC_TRUE}" && test -z "${COMPILER_IS_GCC_FALSE}"; then
-  as_fn_error $? "conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${COMPILER_IS_GCC_TRUE}" && test -z "${COMPILER_IS_GCC_FALSE}"; then
-  as_fn_error $? "conditional \"COMPILER_IS_GCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"COMPILER_IS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 if test -z "${USE_C99_TYPES_TRUE}" && test -z "${USE_C99_TYPES_FALSE}"; then
-  as_fn_error $? "conditional \"USE_C99_TYPES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_C99_TYPES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"USE_C99_TYPES\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
-  as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_COND_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_BYTESWAP_H_TRUE}" && test -z "${GL_GENERATE_BYTESWAP_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_STDBOOL_H_TRUE}" && test -z "${GL_GENERATE_STDBOOL_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_STDBOOL_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_STDDEF_H_TRUE}" && test -z "${GL_GENERATE_STDDEF_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDDEF_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_STDDEF_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then
-  as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"GL_GENERATE_STDINT_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"GL_GENERATE_STDINT_H\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
     gl_libobjs=
@@ -26827,50 +37927,76 @@ fi
 
 
 if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
-  as_fn_error $? "conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
-  as_fn_error $? "conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
-  as_fn_error $? "conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${CPPUNIT_TRUE}" && test -z "${CPPUNIT_FALSE}"; then
-  as_fn_error $? "conditional \"CPPUNIT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${DAP4_DEFINED_TRUE}" && test -z "${DAP4_DEFINED_FALSE}"; then
-  as_fn_error $? "conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${DAP4_DEFINED_TRUE}" && test -z "${DAP4_DEFINED_FALSE}"; then
-  as_fn_error $? "conditional \"DAP4_DEFINED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"DAP4_DEFINED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_DEVELOPER_TRUE}" && test -z "${BUILD_DEVELOPER_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_DEVELOPER_TRUE}" && test -z "${BUILD_DEVELOPER_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_DEVELOPER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BUILD_DEVELOPER\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_VALGRIND_TRUE}" && test -z "${USE_VALGRIND_FALSE}"; then
-  as_fn_error $? "conditional \"USE_VALGRIND\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_VALGRIND\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"USE_VALGRIND\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -26880,18 +38006,17 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -26899,15 +38024,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -26915,13 +38048,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -26932,7 +38059,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -26955,6 +38082,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -26964,16 +38098,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -26985,16 +38118,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -27006,89 +38135,7 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
+# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -27102,12 +38149,8 @@ else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
+# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -27127,25 +38170,76 @@ $as_echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+# CDPATH.
+$as_unset CDPATH
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -27160,85 +38254,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -27248,19 +38306,13 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+# Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdap $as_me 3.18.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+This file was extended by libdap $as_me 3.18.2, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -27292,15 +38344,13 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -27319,17 +38369,16 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <opendap-tech at opendap.org>."
+Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdap config.status 3.18.1
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
+libdap config.status 3.18.2
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -27347,16 +38396,11 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -27370,29 +38414,27 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    { $as_echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -27400,10 +38442,11 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
+  *) ac_config_targets="$ac_config_targets $1"
      ac_need_defaults=false ;;
 
   esac
@@ -27420,7 +38463,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -27444,7 +38487,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
@@ -27828,7 +38870,9 @@ do
     "unit-tests/cache-testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/cache-testsuite/Makefile" ;;
     "dap-config") CONFIG_FILES="$CONFIG_FILES dap-config" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
   esac
 done
 
@@ -27851,24 +38895,26 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
+} ||
+{
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
+}
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -27876,13 +38922,7 @@ ac_tmp=$tmp
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
+ac_cr='
'
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
@@ -27890,7 +38930,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -27899,18 +38939,24 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -27918,7 +38964,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -27932,7 +38978,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -27946,7 +38992,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\)..*/\1/
+s/\(.\{148\}\).*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -27966,7 +39012,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -27998,29 +39044,23 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -28032,7 +39072,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -28044,11 +39084,13 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -28133,7 +39175,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -28146,7 +39190,9 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+   { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -28165,7 +39211,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -28174,10 +39220,12 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+   { (exit 1); exit 1; }; };;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -28188,7 +39236,7 @@ do
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -28200,8 +39248,10 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -28229,7 +39279,47 @@ $as_echo X"$ac_file" |
 	    q
 	  }
 	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
+  { as_dir="$ac_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
@@ -28286,6 +39376,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
+
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -28295,11 +39386,12 @@ ac_sed_dataroot='
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p'
+/@mandir@/p
+'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -28309,7 +39401,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
+    s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -28337,24 +39429,27 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
@@ -28363,21 +39458,27 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -28415,7 +39516,7 @@ $as_echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -28425,7 +39526,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     "tests/atconfig":C) cat >tests/atconfig <<ATEOF
 # Configurable variable values for building test suites.
 # Generated by $0.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='tests'
@@ -28533,7 +39634,47 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      { as_dir=$dirpart/$fdir
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -29348,12 +40489,15 @@ _LT_EOF
 done # for ac_tag
 
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -29374,10 +40518,10 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || { (exit 1); exit 1; }
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff --git a/configure.ac b/configure.ac
index 81ce14f..cb8a0d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
 dnl Update version here and below at LIB_CURRENT, ..., if needed.
-AC_INIT(libdap, 3.18.1, opendap-tech at opendap.org)
+AC_INIT(libdap, 3.18.2, opendap-tech at opendap.org)
 AC_DEFINE(DAP_PROTOCOL_VERSION, ["4.0"], [Highest DAP version implemented?])
 AC_SUBST(DAP_PROTOCOL_VERSION)
 
@@ -45,8 +45,8 @@ dnl increment AGE, set REVISION to 0.
 dnl Interfaces removed or changed (BAD, breaks upward compatibility):
 dnl ==> Increment CURRENT, set AGE and REVISION to 0.
 
-DAPLIB_CURRENT=23
-DAPLIB_AGE=0
+DAPLIB_CURRENT=24
+DAPLIB_AGE=1
 DAPLIB_REVISION=0
 AC_SUBST(DAPLIB_CURRENT)
 AC_SUBST(DAPLIB_AGE)
@@ -57,7 +57,7 @@ AC_SUBST(LIBDAP_VERSION)
 
 CLIENTLIB_CURRENT=7
 CLIENTLIB_AGE=1
-CLIENTLIB_REVISION=4
+CLIENTLIB_REVISION=5
 AC_SUBST(CLIENTLIB_CURRENT)
 AC_SUBST(CLIENTLIB_AGE)
 AC_SUBST(CLIENTLIB_REVISION)
@@ -67,7 +67,7 @@ AC_SUBST(CLIENTLIB_VERSION)
 
 SERVERLIB_CURRENT=13
 SERVERLIB_AGE=6
-SERVERLIB_REVISION=4
+SERVERLIB_REVISION=5
 AC_SUBST(SERVERLIB_CURRENT)
 AC_SUBST(SERVERLIB_AGE)
 AC_SUBST(SERVERLIB_REVISION)
diff --git a/d4_ce/D4ConstraintEvaluator.cc b/d4_ce/D4ConstraintEvaluator.cc
index 3949de3..2401bb5 100644
--- a/d4_ce/D4ConstraintEvaluator.cc
+++ b/d4_ce/D4ConstraintEvaluator.cc
@@ -44,6 +44,7 @@
 #include "D4RValue.h"
 #include "D4FilterClause.h"
 
+#include "escaping.h"
 #include "parser.h"		// for get_ull()
 #include "debug.h"
 
@@ -410,6 +411,23 @@ D4ConstraintEvaluator::add_filter_clause(const std::string &op, const std::strin
     }
 }
 
+/**
+ * @brief If the string has surrounding quotes, remove them.
+ *
+ * @param src The source string, passed by reference and modified in place
+ * @return A reference to the sting parameter.
+ */
+string &
+D4ConstraintEvaluator::remove_quotes(string &s)
+{
+    if (*s.begin() == '\"' && *(s.end() - 1) == '\"') {
+        s.erase(s.begin());
+        s.erase(s.end() - 1);
+    }
+
+    return s;
+}
+
 // This method is called from the parser (see d4_ce_parser.yy, down in the code
 // section). This will be called during the call to D4CEParser::parse(), that
 // is inside D4ConstraintEvaluator::parse(...)
diff --git a/d4_ce/D4ConstraintEvaluator.h b/d4_ce/D4ConstraintEvaluator.h
index 285b39f..8691b38 100644
--- a/d4_ce/D4ConstraintEvaluator.h
+++ b/d4_ce/D4ConstraintEvaluator.h
@@ -113,6 +113,8 @@ class D4ConstraintEvaluator {
 	// Build FilterClauseList for filter clauses for a Sequence
 	void add_filter_clause(const std::string &op, const std::string &arg1, const std::string &arg2);
 
+	std::string &remove_quotes(std::string &src);
+
 	friend class D4CEParser;
 
 public:
diff --git a/d4_ce/Makefile.in b/d4_ce/Makefile.in
index 54180f8..5c50ef4 100644
--- a/d4_ce/Makefile.in
+++ b/d4_ce/Makefile.in
@@ -544,7 +544,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/d4_ce/d4_ce_parser.tab.cc b/d4_ce/d4_ce_parser.tab.cc
index 406a16a..f12bb32 100644
--- a/d4_ce/d4_ce_parser.tab.cc
+++ b/d4_ce/d4_ce_parser.tab.cc
@@ -49,7 +49,7 @@
 
 #line 51 "d4_ce_parser.tab.cc" // lalr1.cc:412
 // Unqualified %code blocks.
-#line 75 "d4_ce_parser.yy" // lalr1.cc:413
+#line 76 "d4_ce_parser.yy" // lalr1.cc:413
 
    #include <iostream>
    #include <cstdlib>
@@ -899,7 +899,7 @@ namespace libdap {
 
 
     // User initialization code.
-    #line 67 "d4_ce_parser.yy" // lalr1.cc:745
+    #line 68 "d4_ce_parser.yy" // lalr1.cc:741
 {
     // Initialize the initial location. This is printed when the parser builds
     // its own error messages - when the parse fails as opposed to when the 
@@ -908,7 +908,7 @@ namespace libdap {
     yyla.location.initialize (driver.expression());
 }
 
-#line 912 "d4_ce_parser.tab.cc" // lalr1.cc:745
+#line 912 "d4_ce_parser.tab.cc" // lalr1.cc:741
 
     /* Initialize the stack.  The initial state will be set in
        yynewstate, since the latter expects the semantical and the
@@ -1041,31 +1041,31 @@ namespace libdap {
           switch (yyn)
             {
   case 2:
-#line 146 "d4_ce_parser.yy" // lalr1.cc:859
+#line 147 "d4_ce_parser.yy" // lalr1.cc:859
     { driver.set_result(yystack_[0].value.as< bool > ()); }
 #line 1047 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 3:
-#line 147 "d4_ce_parser.yy" // lalr1.cc:859
+#line 148 "d4_ce_parser.yy" // lalr1.cc:859
     { driver.set_result(yystack_[2].value.as< bool > () && yystack_[0].value.as< bool > ()); }
 #line 1053 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 4:
-#line 150 "d4_ce_parser.yy" // lalr1.cc:859
+#line 151 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[0].value.as< bool > (); }
 #line 1059 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 5:
-#line 151 "d4_ce_parser.yy" // lalr1.cc:859
+#line 152 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[2].value.as< bool > () && yystack_[0].value.as< bool > (); }
 #line 1065 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 6:
-#line 155 "d4_ce_parser.yy" // lalr1.cc:859
+#line 156 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< bool > () = driver.slice_dimension(yystack_[2].value.as< std::string > (), yystack_[0].value.as< libdap::D4ConstraintEvaluator::index > ());
 }
@@ -1073,31 +1073,31 @@ namespace libdap {
     break;
 
   case 7:
-#line 160 "d4_ce_parser.yy" // lalr1.cc:859
+#line 161 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[0].value.as< bool > (); }
 #line 1079 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 8:
-#line 161 "d4_ce_parser.yy" // lalr1.cc:859
+#line 162 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[2].value.as< bool > () && yystack_[0].value.as< bool > (); }
 #line 1085 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 9:
-#line 171 "d4_ce_parser.yy" // lalr1.cc:859
+#line 172 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[0].value.as< bool > (); driver.pop_basetype(); }
 #line 1091 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 10:
-#line 175 "d4_ce_parser.yy" // lalr1.cc:859
+#line 176 "d4_ce_parser.yy" // lalr1.cc:859
     { driver.pop_basetype(); yylhs.value.as< bool > () = yystack_[2].value.as< bool > () && yystack_[0].value.as< bool > (); }
 #line 1097 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 11:
-#line 183 "d4_ce_parser.yy" // lalr1.cc:859
+#line 184 "d4_ce_parser.yy" // lalr1.cc:859
     {
     BaseType *btp = 0;
     if (driver.top_basetype()) {
@@ -1120,7 +1120,7 @@ namespace libdap {
     break;
 
   case 12:
-#line 203 "d4_ce_parser.yy" // lalr1.cc:859
+#line 204 "d4_ce_parser.yy" // lalr1.cc:859
     {
     BaseType *btp = 0;
     if (driver.top_basetype()) {
@@ -1146,7 +1146,7 @@ namespace libdap {
     break;
 
   case 13:
-#line 227 "d4_ce_parser.yy" // lalr1.cc:859
+#line 228 "d4_ce_parser.yy" // lalr1.cc:859
     {
     BaseType *btp = 0;
     if (driver.top_basetype()) {
@@ -1181,7 +1181,7 @@ namespace libdap {
     break;
 
   case 14:
-#line 258 "d4_ce_parser.yy" // lalr1.cc:859
+#line 259 "d4_ce_parser.yy" // lalr1.cc:859
     { 
     //driver.pop_basetype(); 
     yylhs.value.as< bool > () = true; 
@@ -1190,7 +1190,7 @@ namespace libdap {
     break;
 
   case 15:
-#line 266 "d4_ce_parser.yy" // lalr1.cc:859
+#line 267 "d4_ce_parser.yy" // lalr1.cc:859
     {
     BaseType *btp = 0;
     if (driver.top_basetype()) {
@@ -1218,7 +1218,7 @@ namespace libdap {
     break;
 
   case 16:
-#line 290 "d4_ce_parser.yy" // lalr1.cc:859
+#line 291 "d4_ce_parser.yy" // lalr1.cc:859
     { 
     //driver.pop_basetype();
     yylhs.value.as< bool > () = true; 
@@ -1227,7 +1227,7 @@ namespace libdap {
     break;
 
   case 17:
-#line 301 "d4_ce_parser.yy" // lalr1.cc:859
+#line 302 "d4_ce_parser.yy" // lalr1.cc:859
     { 
     driver.push_index(yystack_[0].value.as< libdap::D4ConstraintEvaluator::index > ()); 
     yylhs.value.as< bool > () = true; 
@@ -1236,79 +1236,79 @@ namespace libdap {
     break;
 
   case 18:
-#line 305 "d4_ce_parser.yy" // lalr1.cc:859
+#line 306 "d4_ce_parser.yy" // lalr1.cc:859
     { driver.push_index(yystack_[0].value.as< libdap::D4ConstraintEvaluator::index > ()); }
 #line 1242 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 19:
-#line 305 "d4_ce_parser.yy" // lalr1.cc:859
+#line 306 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[0].value.as< bool > (); }
 #line 1248 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 20:
-#line 308 "d4_ce_parser.yy" // lalr1.cc:859
+#line 311 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(); }
 #line 1254 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 21:
-#line 309 "d4_ce_parser.yy" // lalr1.cc:859
+#line 312 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[1].value.as< std::string > ()); }
 #line 1260 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 22:
-#line 310 "d4_ce_parser.yy" // lalr1.cc:859
+#line 313 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[3].value.as< std::string > (), 1, yystack_[1].value.as< std::string > ()); }
 #line 1266 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 23:
-#line 311 "d4_ce_parser.yy" // lalr1.cc:859
+#line 314 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[5].value.as< std::string > (), yystack_[3].value.as< std::string > (), yystack_[1].value.as< std::string > ()); }
 #line 1272 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 24:
-#line 312 "d4_ce_parser.yy" // lalr1.cc:859
+#line 315 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[2].value.as< std::string > (), 1); }
 #line 1278 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 25:
-#line 313 "d4_ce_parser.yy" // lalr1.cc:859
+#line 316 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< libdap::D4ConstraintEvaluator::index > () = driver.make_index(yystack_[4].value.as< std::string > (), yystack_[2].value.as< std::string > ()); }
 #line 1284 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 26:
-#line 316 "d4_ce_parser.yy" // lalr1.cc:859
+#line 319 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[1].value.as< bool > (); }
 #line 1290 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 27:
-#line 322 "d4_ce_parser.yy" // lalr1.cc:859
+#line 325 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = true; }
 #line 1296 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 28:
-#line 323 "d4_ce_parser.yy" // lalr1.cc:859
+#line 326 "d4_ce_parser.yy" // lalr1.cc:859
     { yylhs.value.as< bool > () = yystack_[2].value.as< bool > () && yystack_[0].value.as< bool > (); }
 #line 1302 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 29:
-#line 335 "d4_ce_parser.yy" // lalr1.cc:859
+#line 338 "d4_ce_parser.yy" // lalr1.cc:859
     { driver.add_filter_clause(yystack_[1].value.as< std::string > (), yystack_[2].value.as< std::string > (), yystack_[0].value.as< std::string > ()); yylhs.value.as< bool > () = true; }
 #line 1308 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 30:
-#line 338 "d4_ce_parser.yy" // lalr1.cc:859
+#line 341 "d4_ce_parser.yy" // lalr1.cc:859
     { 
     driver.add_filter_clause(yystack_[3].value.as< std::string > (), yystack_[4].value.as< std::string > (), yystack_[2].value.as< std::string > ()); 
     driver.add_filter_clause(yystack_[1].value.as< std::string > (), yystack_[2].value.as< std::string > (), yystack_[0].value.as< std::string > ()); 
@@ -1319,73 +1319,73 @@ namespace libdap {
     break;
 
   case 31:
-#line 344 "d4_ce_parser.yy" // lalr1.cc:859
+#line 347 "d4_ce_parser.yy" // lalr1.cc:859
     { throw Error(malformed_expr, "The 'ND' operator is not currently supported."); }
 #line 1325 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 32:
-#line 352 "d4_ce_parser.yy" // lalr1.cc:859
+#line 355 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "<";}
 #line 1331 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 33:
-#line 353 "d4_ce_parser.yy" // lalr1.cc:859
+#line 356 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = ">";}
 #line 1337 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 34:
-#line 354 "d4_ce_parser.yy" // lalr1.cc:859
+#line 357 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "<=";}
 #line 1343 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 35:
-#line 355 "d4_ce_parser.yy" // lalr1.cc:859
+#line 358 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = ">=";}
 #line 1349 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 36:
-#line 356 "d4_ce_parser.yy" // lalr1.cc:859
+#line 359 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "==";}
 #line 1355 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 37:
-#line 357 "d4_ce_parser.yy" // lalr1.cc:859
+#line 360 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "!=";}
 #line 1361 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 38:
-#line 358 "d4_ce_parser.yy" // lalr1.cc:859
+#line 361 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "~=";}
 #line 1367 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 39:
-#line 360 "d4_ce_parser.yy" // lalr1.cc:859
+#line 363 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "<<";}
 #line 1373 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 40:
-#line 361 "d4_ce_parser.yy" // lalr1.cc:859
+#line 364 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = ">>";}
 #line 1379 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 41:
-#line 363 "d4_ce_parser.yy" // lalr1.cc:859
+#line 366 "d4_ce_parser.yy" // lalr1.cc:859
     {yylhs.value.as< std::string > () = "@=";}
 #line 1385 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 42:
-#line 367 "d4_ce_parser.yy" // lalr1.cc:859
+#line 370 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
 }
@@ -1393,7 +1393,7 @@ namespace libdap {
     break;
 
   case 43:
-#line 371 "d4_ce_parser.yy" // lalr1.cc:859
+#line 374 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< std::string > ().append("/");
     yylhs.value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
@@ -1402,7 +1402,7 @@ namespace libdap {
     break;
 
   case 44:
-#line 376 "d4_ce_parser.yy" // lalr1.cc:859
+#line 379 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yystack_[2].value.as< std::string > ().append("/");
     yystack_[2].value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
@@ -1412,7 +1412,7 @@ namespace libdap {
     break;
 
   case 45:
-#line 384 "d4_ce_parser.yy" // lalr1.cc:859
+#line 387 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< std::string > ().append("/");
     yylhs.value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
@@ -1421,9 +1421,9 @@ namespace libdap {
     break;
 
   case 46:
-#line 389 "d4_ce_parser.yy" // lalr1.cc:859
+#line 392 "d4_ce_parser.yy" // lalr1.cc:859
     {
-    yystack_[2].value.as< std::string > ().append(".");
+    yystack_[2].value.as< std::string > ().append("/");
     yystack_[2].value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
     yylhs.value.as< std::string > () = yystack_[2].value.as< std::string > ();
 }
@@ -1431,7 +1431,7 @@ namespace libdap {
     break;
 
   case 47:
-#line 397 "d4_ce_parser.yy" // lalr1.cc:859
+#line 400 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yylhs.value.as< std::string > () = yystack_[0].value.as< std::string > ();
 }
@@ -1439,7 +1439,7 @@ namespace libdap {
     break;
 
   case 48:
-#line 401 "d4_ce_parser.yy" // lalr1.cc:859
+#line 404 "d4_ce_parser.yy" // lalr1.cc:859
     {
     yystack_[2].value.as< std::string > ().append(".");
     yystack_[2].value.as< std::string > ().append(yystack_[0].value.as< std::string > ());
@@ -1449,17 +1449,17 @@ namespace libdap {
     break;
 
   case 49:
-#line 412 "d4_ce_parser.yy" // lalr1.cc:859
+#line 421 "d4_ce_parser.yy" // lalr1.cc:859
     {
-    yylhs.value.as< std::string > ()=yystack_[0].value.as< std::string > ();
+    yylhs.value.as< std::string > ()=www2id(yystack_[0].value.as< std::string > ());
 }
 #line 1457 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
 
   case 50:
-#line 416 "d4_ce_parser.yy" // lalr1.cc:859
+#line 425 "d4_ce_parser.yy" // lalr1.cc:859
     {
-    yylhs.value.as< std::string > ()=yystack_[0].value.as< std::string > ();
+    yylhs.value.as< std::string > ()=driver.remove_quotes(yystack_[0].value.as< std::string > ());
 }
 #line 1465 "d4_ce_parser.tab.cc" // lalr1.cc:859
     break;
@@ -1845,12 +1845,12 @@ namespace libdap {
   const unsigned short int
   D4CEParser::yyrline_[] =
   {
-       0,   146,   146,   147,   150,   151,   154,   160,   161,   171,
-     175,   182,   202,   227,   226,   266,   265,   300,   305,   305,
-     308,   309,   310,   311,   312,   313,   316,   322,   323,   334,
-     337,   344,   352,   353,   354,   355,   356,   357,   358,   360,
-     361,   363,   366,   370,   375,   383,   388,   396,   400,   411,
-     415
+       0,   147,   147,   148,   151,   152,   155,   161,   162,   172,
+     176,   183,   203,   228,   227,   267,   266,   301,   306,   306,
+     311,   312,   313,   314,   315,   316,   319,   325,   326,   337,
+     340,   347,   355,   356,   357,   358,   359,   360,   361,   363,
+     364,   366,   369,   373,   378,   386,   391,   399,   403,   420,
+     424
   };
 
   // Print the state stack on the debug stream.
@@ -1935,7 +1935,7 @@ namespace libdap {
 #line 35 "d4_ce_parser.yy" // lalr1.cc:1167
 } // libdap
 #line 1938 "d4_ce_parser.tab.cc" // lalr1.cc:1167
-#line 421 "d4_ce_parser.yy" // lalr1.cc:1168
+#line 430 "d4_ce_parser.yy" // lalr1.cc:1168
 
 
 // Forward the error to the driver for handling. The location parameter
diff --git a/d4_ce/d4_ce_parser.tab.hh b/d4_ce/d4_ce_parser.tab.hh
index c12a6f8..8ba00b3 100644
--- a/d4_ce/d4_ce_parser.tab.hh
+++ b/d4_ce/d4_ce_parser.tab.hh
@@ -40,15 +40,16 @@
 #ifndef YY_YY_D4_CE_PARSER_TAB_HH_INCLUDED
 # define YY_YY_D4_CE_PARSER_TAB_HH_INCLUDED
 // //                    "%code requires" blocks.
-#line 48 "d4_ce_parser.yy" // lalr1.cc:392
+#line 48 "d4_ce_parser.yy" // lalr1.cc:377
 
 #include "D4ConstraintEvaluator.h"
+#include "escaping.h" // for www2id() used with WORD and STRING
 namespace libdap {
     class D4CEScanner;
 }
 
 
-#line 52 "d4_ce_parser.tab.hh" // lalr1.cc:392
+#line 53 "d4_ce_parser.tab.hh" // lalr1.cc:377
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -123,9 +124,9 @@ namespace libdap {
 # define YYDEBUG 1
 #endif
 
-#line 35 "d4_ce_parser.yy" // lalr1.cc:392
+#line 35 "d4_ce_parser.yy" // lalr1.cc:377
 namespace libdap {
-#line 129 "d4_ce_parser.tab.hh" // lalr1.cc:392
+#line 130 "d4_ce_parser.tab.hh" // lalr1.cc:377
 
 
 
@@ -791,9 +792,9 @@ namespace libdap {
   };
 
 
-#line 35 "d4_ce_parser.yy" // lalr1.cc:392
+#line 35 "d4_ce_parser.yy" // lalr1.cc:377
 } // libdap
-#line 797 "d4_ce_parser.tab.hh" // lalr1.cc:392
+#line 798 "d4_ce_parser.tab.hh" // lalr1.cc:377
 
 
 
diff --git a/d4_ce/d4_ce_parser.yy b/d4_ce/d4_ce_parser.yy
index eed0324..2866654 100644
--- a/d4_ce/d4_ce_parser.yy
+++ b/d4_ce/d4_ce_parser.yy
@@ -47,6 +47,7 @@
 
 %code requires {
 #include "D4ConstraintEvaluator.h"
+#include "escaping.h" // for www2id() used with WORD and STRING
 namespace libdap {
     class D4CEScanner;
 }
@@ -304,7 +305,9 @@ indexes : index
 }
 | index { driver.push_index($1); } indexes { $$ = $3; }
 ;
-   
+
+// Note that the index values are scanned as WORDs but the web escaping is
+// not supported as it is for identifiers. jhrg 10/20/16
 index   : "[" "]" { $$ = driver.make_index(); }
 | "[" WORD "]" { $$ = driver.make_index($2); }
 | "[" WORD ":" WORD "]" { $$ = driver.make_index($2, 1, $4); }
@@ -387,7 +390,7 @@ group : "/" name
 }
 | group "/" name
 {
-    $1.append(".");
+    $1.append("/");
     $1.append($3);
     $$ = $1;
 }
@@ -408,13 +411,19 @@ path : name
 // Because some formats/datasets allow 'any' name for a variable, it's possible
 // that a variable name will be a number, etc. The grammar also allows STRING
 // to support "name"."name with spaces and dots (.)".x
+//
+// I added calls here to remove the double quotes because they were breaking
+// the parse for STRINGs and also added www2id() for WORDs (so that %20, etc.
+// can be used for escaping stuff). However, the two cannot be mixed - if the
+// parser id passed"Point%20Break" the %20 will remain as a literal in the STRING.
+// jhrg 10/20/16
 name : WORD 
 {
-    $$=$1;
+    $$=www2id($1);
 }
 | STRING 
 {
-    $$=$1;
+    $$=driver.remove_quotes($1);
 }
 ;
 
diff --git a/d4_ce/d4_ce_scanner.ll b/d4_ce/d4_ce_scanner.ll
index 43da99d..1e28096 100644
--- a/d4_ce/d4_ce_scanner.ll
+++ b/d4_ce/d4_ce_scanner.ll
@@ -152,7 +152,7 @@ loc->step();
 <quote>["]  { 
                 /* An unescaped double quote in the 'quote' state indicates the end of the string */
                 BEGIN(INITIAL); 
-                yylval->build<std::string>(yytext); 
+                yylval->build<std::string>(yytext);
                 return token::STRING;
             }
 
diff --git a/d4_ce/location.hh b/d4_ce/location.hh
index 052f4a1..24a313c 100644
--- a/d4_ce/location.hh
+++ b/d4_ce/location.hh
@@ -40,9 +40,9 @@
 
 # include "position.hh"
 
-#line 35 "d4_ce_parser.yy" // location.cc:337
+#line 35 "d4_ce_parser.yy" // location.cc:296
 namespace libdap {
-#line 46 "location.hh" // location.cc:337
+#line 46 "location.hh" // location.cc:296
   /// Abstract a location.
   class location
   {
@@ -186,7 +186,7 @@ namespace libdap {
     return ostr;
   }
 
-#line 35 "d4_ce_parser.yy" // location.cc:337
+#line 35 "d4_ce_parser.yy" // location.cc:296
 } // libdap
-#line 192 "location.hh" // location.cc:337
+#line 192 "location.hh" // location.cc:296
 #endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_ce/position.hh b/d4_ce/position.hh
index 3f982db..853ddb2 100644
--- a/d4_ce/position.hh
+++ b/d4_ce/position.hh
@@ -50,9 +50,9 @@
 #  endif
 # endif
 
-#line 35 "d4_ce_parser.yy" // location.cc:337
+#line 35 "d4_ce_parser.yy" // location.cc:296
 namespace libdap {
-#line 56 "position.hh" // location.cc:337
+#line 56 "position.hh" // location.cc:296
   /// Abstract a position.
   class position
   {
@@ -174,7 +174,7 @@ namespace libdap {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 35 "d4_ce_parser.yy" // location.cc:337
+#line 35 "d4_ce_parser.yy" // location.cc:296
 } // libdap
-#line 180 "position.hh" // location.cc:337
+#line 180 "position.hh" // location.cc:296
 #endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_ce/stack.hh b/d4_ce/stack.hh
index d46725b..cb0d137 100644
--- a/d4_ce/stack.hh
+++ b/d4_ce/stack.hh
@@ -40,9 +40,9 @@
 
 # include <vector>
 
-#line 35 "d4_ce_parser.yy" // stack.hh:151
+#line 35 "d4_ce_parser.yy" // stack.hh:132
 namespace libdap {
-#line 46 "stack.hh" // stack.hh:151
+#line 46 "stack.hh" // stack.hh:132
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -150,8 +150,8 @@ namespace libdap {
     unsigned int range_;
   };
 
-#line 35 "d4_ce_parser.yy" // stack.hh:151
+#line 35 "d4_ce_parser.yy" // stack.hh:132
 } // libdap
-#line 156 "stack.hh" // stack.hh:151
+#line 156 "stack.hh" // stack.hh:132
 
 #endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/d4_function/Makefile.in b/d4_function/Makefile.in
index 28b1de6..691a836 100644
--- a/d4_function/Makefile.in
+++ b/d4_function/Makefile.in
@@ -540,7 +540,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/d4_function/d4_function_parser.tab.cc b/d4_function/d4_function_parser.tab.cc
index a3ed27a..82bad91 100644
--- a/d4_function/d4_function_parser.tab.cc
+++ b/d4_function/d4_function_parser.tab.cc
@@ -1288,7 +1288,7 @@ namespace libdap {
 
 
     // User initialization code.
-    #line 69 "d4_function_parser.yy" // lalr1.cc:745
+    #line 69 "d4_function_parser.yy" // lalr1.cc:741
 {
     // Initialize the initial location. This is printed when the parser builds
     // its own error messages - when the parse fails as opposed to when the 
@@ -1297,7 +1297,7 @@ namespace libdap {
     yyla.location.initialize (evaluator.expression());
 }
 
-#line 1301 "d4_function_parser.tab.cc" // lalr1.cc:745
+#line 1301 "d4_function_parser.tab.cc" // lalr1.cc:741
 
     /* Initialize the stack.  The initial state will be set in
        yynewstate, since the latter expects the semantical and the
diff --git a/d4_function/d4_function_parser.tab.hh b/d4_function/d4_function_parser.tab.hh
index c099ee5..6897859 100644
--- a/d4_function/d4_function_parser.tab.hh
+++ b/d4_function/d4_function_parser.tab.hh
@@ -40,7 +40,7 @@
 #ifndef YY_YY_D4_FUNCTION_PARSER_TAB_HH_INCLUDED
 # define YY_YY_D4_FUNCTION_PARSER_TAB_HH_INCLUDED
 // //                    "%code requires" blocks.
-#line 47 "d4_function_parser.yy" // lalr1.cc:392
+#line 47 "d4_function_parser.yy" // lalr1.cc:377
 
 
 #include "D4FunctionEvaluator.h"
@@ -52,7 +52,7 @@ namespace libdap {
 }
 
 
-#line 56 "d4_function_parser.tab.hh" // lalr1.cc:392
+#line 56 "d4_function_parser.tab.hh" // lalr1.cc:377
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -127,9 +127,9 @@ namespace libdap {
 # define YYDEBUG 1
 #endif
 
-#line 34 "d4_function_parser.yy" // lalr1.cc:392
+#line 34 "d4_function_parser.yy" // lalr1.cc:377
 namespace libdap {
-#line 133 "d4_function_parser.tab.hh" // lalr1.cc:392
+#line 133 "d4_function_parser.tab.hh" // lalr1.cc:377
 
 
 
@@ -842,9 +842,9 @@ namespace libdap {
   };
 
 
-#line 34 "d4_function_parser.yy" // lalr1.cc:392
+#line 34 "d4_function_parser.yy" // lalr1.cc:377
 } // libdap
-#line 848 "d4_function_parser.tab.hh" // lalr1.cc:392
+#line 848 "d4_function_parser.tab.hh" // lalr1.cc:377
 
 
 
diff --git a/d4_function/location.hh b/d4_function/location.hh
index ca6215a..84a6cbe 100644
--- a/d4_function/location.hh
+++ b/d4_function/location.hh
@@ -40,9 +40,9 @@
 
 # include "position.hh"
 
-#line 34 "d4_function_parser.yy" // location.cc:337
+#line 34 "d4_function_parser.yy" // location.cc:296
 namespace libdap {
-#line 46 "location.hh" // location.cc:337
+#line 46 "location.hh" // location.cc:296
   /// Abstract a location.
   class location
   {
@@ -186,7 +186,7 @@ namespace libdap {
     return ostr;
   }
 
-#line 34 "d4_function_parser.yy" // location.cc:337
+#line 34 "d4_function_parser.yy" // location.cc:296
 } // libdap
-#line 192 "location.hh" // location.cc:337
+#line 192 "location.hh" // location.cc:296
 #endif // !YY_YY_LOCATION_HH_INCLUDED
diff --git a/d4_function/position.hh b/d4_function/position.hh
index 123a22b..bc9d282 100644
--- a/d4_function/position.hh
+++ b/d4_function/position.hh
@@ -50,9 +50,9 @@
 #  endif
 # endif
 
-#line 34 "d4_function_parser.yy" // location.cc:337
+#line 34 "d4_function_parser.yy" // location.cc:296
 namespace libdap {
-#line 56 "position.hh" // location.cc:337
+#line 56 "position.hh" // location.cc:296
   /// Abstract a position.
   class position
   {
@@ -174,7 +174,7 @@ namespace libdap {
     return ostr << pos.line << '.' << pos.column;
   }
 
-#line 34 "d4_function_parser.yy" // location.cc:337
+#line 34 "d4_function_parser.yy" // location.cc:296
 } // libdap
-#line 180 "position.hh" // location.cc:337
+#line 180 "position.hh" // location.cc:296
 #endif // !YY_YY_POSITION_HH_INCLUDED
diff --git a/d4_function/stack.hh b/d4_function/stack.hh
index 1fb476f..c5c5878 100644
--- a/d4_function/stack.hh
+++ b/d4_function/stack.hh
@@ -40,9 +40,9 @@
 
 # include <vector>
 
-#line 34 "d4_function_parser.yy" // stack.hh:151
+#line 34 "d4_function_parser.yy" // stack.hh:132
 namespace libdap {
-#line 46 "stack.hh" // stack.hh:151
+#line 46 "stack.hh" // stack.hh:132
   template <class T, class S = std::vector<T> >
   class stack
   {
@@ -150,8 +150,8 @@ namespace libdap {
     unsigned int range_;
   };
 
-#line 34 "d4_function_parser.yy" // stack.hh:151
+#line 34 "d4_function_parser.yy" // stack.hh:132
 } // libdap
-#line 156 "stack.hh" // stack.hh:151
+#line 156 "stack.hh" // stack.hh:132
 
 #endif // !YY_YY_STACK_HH_INCLUDED
diff --git a/das.tab.cc b/das.tab.cc
index 949641d..19a6ab6 100644
--- a/das.tab.cc
+++ b/das.tab.cc
@@ -1396,7 +1396,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 194 "das.yy" /* yacc.c:1661  */
+#line 194 "das.yy" /* yacc.c:1646  */
     {
 		if (!name) name = new string();
 		if (!type) type = new string();
@@ -1405,150 +1405,150 @@ yyreduce:
 		// push outermost AttrTable
 		PUSH(DAS_OBJ(arg)->get_top_level_attributes());
 	}
-#line 1409 "das.tab.cc" /* yacc.c:1661  */
+#line 1409 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 203 "das.yy" /* yacc.c:1661  */
+#line 203 "das.yy" /* yacc.c:1646  */
     {
 		POP;	// pop the DAS/AttrTable before stack's dtor
 		delete name; name = 0;
 		delete type; type = 0;
 		delete attr_tab_stack; attr_tab_stack = 0;
 	}
-#line 1420 "das.tab.cc" /* yacc.c:1661  */
+#line 1420 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 218 "das.yy" /* yacc.c:1661  */
+#line 218 "das.yy" /* yacc.c:1646  */
     {
 		    parse_error((parser_arg *)arg, NO_DAS_MSG, das_line_num);
 		}
-#line 1428 "das.tab.cc" /* yacc.c:1661  */
+#line 1428 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 230 "das.yy" /* yacc.c:1661  */
+#line 230 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "Byte", das_line_num); }
-#line 1434 "das.tab.cc" /* yacc.c:1661  */
+#line 1434 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 231 "das.yy" /* yacc.c:1661  */
+#line 231 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1440 "das.tab.cc" /* yacc.c:1661  */
+#line 1440 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 234 "das.yy" /* yacc.c:1661  */
+#line 234 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "Int16", das_line_num); }
-#line 1446 "das.tab.cc" /* yacc.c:1661  */
+#line 1446 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 235 "das.yy" /* yacc.c:1661  */
+#line 235 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1452 "das.tab.cc" /* yacc.c:1661  */
+#line 1452 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 238 "das.yy" /* yacc.c:1661  */
+#line 238 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "UInt16", das_line_num); }
-#line 1458 "das.tab.cc" /* yacc.c:1661  */
+#line 1458 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 239 "das.yy" /* yacc.c:1661  */
+#line 239 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1464 "das.tab.cc" /* yacc.c:1661  */
+#line 1464 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 242 "das.yy" /* yacc.c:1661  */
+#line 242 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "Int32", das_line_num); }
-#line 1470 "das.tab.cc" /* yacc.c:1661  */
+#line 1470 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 243 "das.yy" /* yacc.c:1661  */
+#line 243 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1476 "das.tab.cc" /* yacc.c:1661  */
+#line 1476 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 246 "das.yy" /* yacc.c:1661  */
+#line 246 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "UInt32", das_line_num); }
-#line 1482 "das.tab.cc" /* yacc.c:1661  */
+#line 1482 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 247 "das.yy" /* yacc.c:1661  */
+#line 247 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1488 "das.tab.cc" /* yacc.c:1661  */
+#line 1488 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 250 "das.yy" /* yacc.c:1661  */
+#line 250 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "Float32", das_line_num); }
-#line 1494 "das.tab.cc" /* yacc.c:1661  */
+#line 1494 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 251 "das.yy" /* yacc.c:1661  */
+#line 251 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1500 "das.tab.cc" /* yacc.c:1661  */
+#line 1500 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 254 "das.yy" /* yacc.c:1661  */
+#line 254 "das.yy" /* yacc.c:1646  */
     { save_str(*type, "Float64", das_line_num); }
-#line 1506 "das.tab.cc" /* yacc.c:1661  */
+#line 1506 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 255 "das.yy" /* yacc.c:1661  */
+#line 255 "das.yy" /* yacc.c:1646  */
     { save_str(*name, (yyvsp[0]), das_line_num); }
-#line 1512 "das.tab.cc" /* yacc.c:1661  */
+#line 1512 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 258 "das.yy" /* yacc.c:1661  */
+#line 258 "das.yy" /* yacc.c:1646  */
     { *type = "String"; }
-#line 1518 "das.tab.cc" /* yacc.c:1661  */
+#line 1518 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 259 "das.yy" /* yacc.c:1661  */
+#line 259 "das.yy" /* yacc.c:1646  */
     { *name = (yyvsp[0]); }
-#line 1524 "das.tab.cc" /* yacc.c:1661  */
+#line 1524 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 262 "das.yy" /* yacc.c:1661  */
+#line 262 "das.yy" /* yacc.c:1646  */
     { *type = "Url"; }
-#line 1530 "das.tab.cc" /* yacc.c:1661  */
+#line 1530 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 263 "das.yy" /* yacc.c:1661  */
+#line 263 "das.yy" /* yacc.c:1646  */
     { *name = (yyvsp[0]); }
-#line 1536 "das.tab.cc" /* yacc.c:1661  */
+#line 1536 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 266 "das.yy" /* yacc.c:1661  */
+#line 266 "das.yy" /* yacc.c:1646  */
     { *type = "OtherXML"; }
-#line 1542 "das.tab.cc" /* yacc.c:1661  */
+#line 1542 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 267 "das.yy" /* yacc.c:1661  */
+#line 267 "das.yy" /* yacc.c:1646  */
     { *name = (yyvsp[0]); }
-#line 1548 "das.tab.cc" /* yacc.c:1661  */
+#line 1548 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 271 "das.yy" /* yacc.c:1661  */
+#line 271 "das.yy" /* yacc.c:1646  */
     {
 		    DBG(cerr << "Processing ID: " << (yyvsp[0]) << endl);
 		    
@@ -1568,175 +1568,175 @@ yyreduce:
 		    DBG(cerr << " Pushed attr_tab: " << at << endl);
 
 		}
-#line 1572 "das.tab.cc" /* yacc.c:1661  */
+#line 1572 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 291 "das.yy" /* yacc.c:1661  */
+#line 291 "das.yy" /* yacc.c:1646  */
     {
 		    /* pop top of stack; store in attr_tab */
 		    DBG(cerr << " Popped attr_tab: " << TOP_OF_STACK << endl);
 		    POP;
 		}
-#line 1582 "das.tab.cc" /* yacc.c:1661  */
+#line 1582 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 299 "das.yy" /* yacc.c:1661  */
+#line 299 "das.yy" /* yacc.c:1646  */
     { 
 		    parse_error(ATTR_TUPLE_MSG, das_line_num, (yyvsp[0]));
 		}
-#line 1590 "das.tab.cc" /* yacc.c:1661  */
+#line 1590 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 305 "das.yy" /* yacc.c:1661  */
+#line 305 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_byte);
 		}
-#line 1598 "das.tab.cc" /* yacc.c:1661  */
+#line 1598 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 309 "das.yy" /* yacc.c:1661  */
+#line 309 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_byte);
 		}
-#line 1606 "das.tab.cc" /* yacc.c:1661  */
+#line 1606 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 315 "das.yy" /* yacc.c:1661  */
+#line 315 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_int16);
 		}
-#line 1614 "das.tab.cc" /* yacc.c:1661  */
+#line 1614 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 319 "das.yy" /* yacc.c:1661  */
+#line 319 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_int16);
 		}
-#line 1622 "das.tab.cc" /* yacc.c:1661  */
+#line 1622 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 325 "das.yy" /* yacc.c:1661  */
+#line 325 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
 		}
-#line 1630 "das.tab.cc" /* yacc.c:1661  */
+#line 1630 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 329 "das.yy" /* yacc.c:1661  */
+#line 329 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_uint16);
 		}
-#line 1638 "das.tab.cc" /* yacc.c:1661  */
+#line 1638 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 335 "das.yy" /* yacc.c:1661  */
+#line 335 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_int32);
 		}
-#line 1646 "das.tab.cc" /* yacc.c:1661  */
+#line 1646 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 339 "das.yy" /* yacc.c:1661  */
+#line 339 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_int32);
 		}
-#line 1654 "das.tab.cc" /* yacc.c:1661  */
+#line 1654 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 345 "das.yy" /* yacc.c:1661  */
+#line 345 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
 		}
-#line 1662 "das.tab.cc" /* yacc.c:1661  */
+#line 1662 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 349 "das.yy" /* yacc.c:1661  */
+#line 349 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_uint32);
 		}
-#line 1670 "das.tab.cc" /* yacc.c:1661  */
+#line 1670 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 355 "das.yy" /* yacc.c:1661  */
+#line 355 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_float32);
 		}
-#line 1678 "das.tab.cc" /* yacc.c:1661  */
+#line 1678 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 359 "das.yy" /* yacc.c:1661  */
+#line 359 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_float32);
 		}
-#line 1686 "das.tab.cc" /* yacc.c:1661  */
+#line 1686 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 365 "das.yy" /* yacc.c:1661  */
+#line 365 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_float64);
 		}
-#line 1694 "das.tab.cc" /* yacc.c:1661  */
+#line 1694 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 369 "das.yy" /* yacc.c:1661  */
+#line 369 "das.yy" /* yacc.c:1646  */
     {
 		    add_attribute(*type, *name, (yyvsp[0]), &check_float64);
 		}
-#line 1702 "das.tab.cc" /* yacc.c:1661  */
+#line 1702 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 375 "das.yy" /* yacc.c:1661  */
+#line 375 "das.yy" /* yacc.c:1646  */
     {
 		    string attr = remove_quotes((yyvsp[0]));
 		    add_attribute(*type, *name, attr, 0);
 		}
-#line 1711 "das.tab.cc" /* yacc.c:1661  */
+#line 1711 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 380 "das.yy" /* yacc.c:1661  */
+#line 380 "das.yy" /* yacc.c:1646  */
     {
 		    string attr = remove_quotes((yyvsp[0]));
 		    add_attribute(*type, *name, attr, 0);
 		}
-#line 1720 "das.tab.cc" /* yacc.c:1661  */
+#line 1720 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 387 "das.yy" /* yacc.c:1661  */
+#line 387 "das.yy" /* yacc.c:1646  */
     {
                     add_attribute(*type, *name, (yyvsp[0]), &check_url);
                 }
-#line 1728 "das.tab.cc" /* yacc.c:1661  */
+#line 1728 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 391 "das.yy" /* yacc.c:1661  */
+#line 391 "das.yy" /* yacc.c:1646  */
     {
                     add_attribute(*type, *name, (yyvsp[0]), &check_url);
                 }
-#line 1736 "das.tab.cc" /* yacc.c:1661  */
+#line 1736 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 397 "das.yy" /* yacc.c:1661  */
+#line 397 "das.yy" /* yacc.c:1646  */
     {
                     // XML must be quoted in the DAS but the quotes are an
                     // artifact of the DAS syntax so they are not part of the
@@ -1748,28 +1748,28 @@ yyreduce:
                     else
                         add_attribute(*type, *name, xml, 0);
                 }
-#line 1752 "das.tab.cc" /* yacc.c:1661  */
+#line 1752 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 425 "das.yy" /* yacc.c:1661  */
+#line 425 "das.yy" /* yacc.c:1646  */
     { 
 		    *name = (yyvsp[0]);
 		}
-#line 1760 "das.tab.cc" /* yacc.c:1661  */
+#line 1760 "das.tab.cc" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 429 "das.yy" /* yacc.c:1661  */
+#line 429 "das.yy" /* yacc.c:1646  */
     {
 		    add_alias( DAS_OBJ(arg)->get_top_level_attributes(),
 		               TOP_OF_STACK, *name, string((yyvsp[0])) ) ;
                 }
-#line 1769 "das.tab.cc" /* yacc.c:1661  */
+#line 1769 "das.tab.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1773 "das.tab.cc" /* yacc.c:1661  */
+#line 1773 "das.tab.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/das.tab.hh b/das.tab.hh
index 8c3664b..efcf24f 100644
--- a/das.tab.hh
+++ b/das.tab.hh
@@ -40,7 +40,7 @@
 extern int dasdebug;
 #endif
 /* "%code requires" blocks.  */
-#line 40 "das.yy" /* yacc.c:1915  */
+#line 40 "das.yy" /* yacc.c:1909  */
 
 
 #define YYSTYPE char *
@@ -85,7 +85,7 @@ using namespace libdap ;
 extern int das_line_num;	/* defined in das.lex */
 
 
-#line 89 "das.tab.hh" /* yacc.c:1915  */
+#line 89 "das.tab.hh" /* yacc.c:1909  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
diff --git a/dds.tab.cc b/dds.tab.cc
index a6ba517..9e0fd6b 100644
--- a/dds.tab.cc
+++ b/dds.tab.cc
@@ -1386,7 +1386,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 160 "dds.yy" /* yacc.c:1661  */
+#line 160 "dds.yy" /* yacc.c:1646  */
     {
 		    /* On entry to the parser, make the BaseType stack. 
 		       I use if (!ctor) here because in the tab.cc file,
@@ -1397,57 +1397,57 @@ yyreduce:
 		    if (!ctor)
 		    	ctor = new stack<BaseType *>;
         }
-#line 1401 "dds.tab.cc" /* yacc.c:1661  */
+#line 1401 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 171 "dds.yy" /* yacc.c:1661  */
+#line 171 "dds.yy" /* yacc.c:1646  */
     {
 		    delete ctor; ctor = 0;
 		}
-#line 1409 "dds.tab.cc" /* yacc.c:1661  */
+#line 1409 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 181 "dds.yy" /* yacc.c:1661  */
+#line 181 "dds.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = (yyvsp[-3].boolean) && (yyvsp[-1].boolean);
 		}
-#line 1417 "dds.tab.cc" /* yacc.c:1661  */
+#line 1417 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 185 "dds.yy" /* yacc.c:1661  */
+#line 185 "dds.yy" /* yacc.c:1646  */
     {
 		    parse_error((parser_arg *)arg, NO_DDS_MSG, dds_line_num, (yyvsp[0].word));
 		    error_exit_cleanup();
 		    YYABORT;
 		}
-#line 1427 "dds.tab.cc" /* yacc.c:1661  */
+#line 1427 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 193 "dds.yy" /* yacc.c:1661  */
+#line 193 "dds.yy" /* yacc.c:1646  */
     {
 		    (yyval.boolean) = true;
 		}
-#line 1435 "dds.tab.cc" /* yacc.c:1661  */
+#line 1435 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 196 "dds.yy" /* yacc.c:1661  */
+#line 196 "dds.yy" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 1441 "dds.tab.cc" /* yacc.c:1661  */
+#line 1441 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 197 "dds.yy" /* yacc.c:1661  */
+#line 197 "dds.yy" /* yacc.c:1646  */
     { (yyval.boolean) = true; }
-#line 1447 "dds.tab.cc" /* yacc.c:1661  */
+#line 1447 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 207 "dds.yy" /* yacc.c:1661  */
+#line 207 "dds.yy" /* yacc.c:1646  */
     { 
 		    string smsg;
 		    if (current->check_semantics(smsg)) {
@@ -1460,21 +1460,21 @@ yyreduce:
             strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
             (yyval.word)[ID_MAX-1] = '\0';
 		}
-#line 1464 "dds.tab.cc" /* yacc.c:1661  */
+#line 1464 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 221 "dds.yy" /* yacc.c:1661  */
+#line 221 "dds.yy" /* yacc.c:1646  */
     { 
 		    if( current ) delete current ;
 		    current = ctor->top(); 
 		    ctor->pop();
 		}
-#line 1474 "dds.tab.cc" /* yacc.c:1661  */
+#line 1474 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 227 "dds.yy" /* yacc.c:1661  */
+#line 227 "dds.yy" /* yacc.c:1646  */
     { 
 		    string smsg;
 		    if (current->check_semantics(smsg)) {
@@ -1488,21 +1488,21 @@ yyreduce:
             strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
             (yyval.word)[ID_MAX-1] = '\0';
 		}
-#line 1492 "dds.tab.cc" /* yacc.c:1661  */
+#line 1492 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 242 "dds.yy" /* yacc.c:1661  */
+#line 242 "dds.yy" /* yacc.c:1646  */
     { 
 		    if( current ) delete current ;
 		    current = ctor->top(); 
 		    ctor->pop();
 		}
-#line 1502 "dds.tab.cc" /* yacc.c:1661  */
+#line 1502 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 248 "dds.yy" /* yacc.c:1661  */
+#line 248 "dds.yy" /* yacc.c:1646  */
     { 
 		    string smsg;
 		    if (current->check_semantics(smsg)) {
@@ -1516,11 +1516,11 @@ yyreduce:
             strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
             (yyval.word)[ID_MAX-1] = '\0';
 		}
-#line 1520 "dds.tab.cc" /* yacc.c:1661  */
+#line 1520 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 263 "dds.yy" /* yacc.c:1661  */
+#line 263 "dds.yy" /* yacc.c:1646  */
     { 
 		    if (is_keyword(string((yyvsp[-1].word)), "array")) {
 			    part = libdap::array;
@@ -1532,11 +1532,11 @@ yyreduce:
 			    YYABORT;
 		    }
         }
-#line 1536 "dds.tab.cc" /* yacc.c:1661  */
+#line 1536 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 275 "dds.yy" /* yacc.c:1661  */
+#line 275 "dds.yy" /* yacc.c:1646  */
     { 
 		    if (is_keyword(string((yyvsp[-1].word)), "maps")) {
 			    part = maps; 
@@ -1548,21 +1548,21 @@ yyreduce:
 			    YYABORT;
 		    }
         }
-#line 1552 "dds.tab.cc" /* yacc.c:1661  */
+#line 1552 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 287 "dds.yy" /* yacc.c:1661  */
+#line 287 "dds.yy" /* yacc.c:1646  */
     {
 		    if( current ) delete current ;
 		    current = ctor->top(); 
 		    ctor->pop();
 		}
-#line 1562 "dds.tab.cc" /* yacc.c:1661  */
+#line 1562 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 293 "dds.yy" /* yacc.c:1661  */
+#line 293 "dds.yy" /* yacc.c:1646  */
     {
 		    string smsg;
 		    if (current->check_semantics(smsg)) {
@@ -1577,106 +1577,106 @@ yyreduce:
         strncpy((yyval.word),(yyvsp[-1].word),ID_MAX);
         (yyval.word)[ID_MAX-1] = '\0';
 		}
-#line 1581 "dds.tab.cc" /* yacc.c:1661  */
+#line 1581 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 309 "dds.yy" /* yacc.c:1661  */
+#line 309 "dds.yy" /* yacc.c:1646  */
     {
 		    ostringstream msg;
 		    msg << BAD_DECLARATION;
 		    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
 		    YYABORT;
 		}
-#line 1592 "dds.tab.cc" /* yacc.c:1661  */
+#line 1592 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 319 "dds.yy" /* yacc.c:1661  */
+#line 319 "dds.yy" /* yacc.c:1646  */
     { 
 		    ctor->push(DDS_OBJ(arg)->get_factory()->NewStructure()); 
 		}
-#line 1600 "dds.tab.cc" /* yacc.c:1661  */
+#line 1600 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 325 "dds.yy" /* yacc.c:1661  */
+#line 325 "dds.yy" /* yacc.c:1646  */
     { 
 		    ctor->push(DDS_OBJ(arg)->get_factory()->NewSequence()); 
 		}
-#line 1608 "dds.tab.cc" /* yacc.c:1661  */
+#line 1608 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 331 "dds.yy" /* yacc.c:1661  */
+#line 331 "dds.yy" /* yacc.c:1646  */
     { 
 		    ctor->push(DDS_OBJ(arg)->get_factory()->NewGrid()); 
 		}
-#line 1616 "dds.tab.cc" /* yacc.c:1661  */
+#line 1616 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 336 "dds.yy" /* yacc.c:1661  */
+#line 336 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewByte(); }
-#line 1622 "dds.tab.cc" /* yacc.c:1661  */
+#line 1622 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 337 "dds.yy" /* yacc.c:1661  */
+#line 337 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt16(); }
-#line 1628 "dds.tab.cc" /* yacc.c:1661  */
+#line 1628 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 338 "dds.yy" /* yacc.c:1661  */
+#line 338 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt16(); }
-#line 1634 "dds.tab.cc" /* yacc.c:1661  */
+#line 1634 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 339 "dds.yy" /* yacc.c:1661  */
+#line 339 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewInt32(); }
-#line 1640 "dds.tab.cc" /* yacc.c:1661  */
+#line 1640 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 340 "dds.yy" /* yacc.c:1661  */
+#line 340 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUInt32(); }
-#line 1646 "dds.tab.cc" /* yacc.c:1661  */
+#line 1646 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 341 "dds.yy" /* yacc.c:1661  */
+#line 341 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat32(); }
-#line 1652 "dds.tab.cc" /* yacc.c:1661  */
+#line 1652 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 342 "dds.yy" /* yacc.c:1661  */
+#line 342 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewFloat64(); }
-#line 1658 "dds.tab.cc" /* yacc.c:1661  */
+#line 1658 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 343 "dds.yy" /* yacc.c:1661  */
+#line 343 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewStr(); }
-#line 1664 "dds.tab.cc" /* yacc.c:1661  */
+#line 1664 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 344 "dds.yy" /* yacc.c:1661  */
+#line 344 "dds.yy" /* yacc.c:1646  */
     { if( current ) delete current ;current = DDS_OBJ(arg)->get_factory()->NewUrl(); }
-#line 1670 "dds.tab.cc" /* yacc.c:1661  */
+#line 1670 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 347 "dds.yy" /* yacc.c:1661  */
+#line 347 "dds.yy" /* yacc.c:1646  */
     { current->set_name((yyvsp[0].word)); }
-#line 1676 "dds.tab.cc" /* yacc.c:1661  */
+#line 1676 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 358 "dds.yy" /* yacc.c:1661  */
+#line 358 "dds.yy" /* yacc.c:1646  */
     { 
 		    if (!check_int32((yyvsp[-1].word))) {
 			    string msg = "In the dataset descriptor object:\n";
@@ -1696,19 +1696,19 @@ yyreduce:
 
 		    (yyval.boolean) = true;
 		 }
-#line 1700 "dds.tab.cc" /* yacc.c:1661  */
+#line 1700 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 379 "dds.yy" /* yacc.c:1661  */
+#line 379 "dds.yy" /* yacc.c:1646  */
     {
 		     if (!id) id = new string((yyvsp[0].word));
 		 }
-#line 1708 "dds.tab.cc" /* yacc.c:1661  */
+#line 1708 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 383 "dds.yy" /* yacc.c:1661  */
+#line 383 "dds.yy" /* yacc.c:1646  */
     { 
 		     if (!check_int32((yyvsp[0].word))) {
 			     string msg = "In the dataset descriptor object:\n";
@@ -1730,19 +1730,19 @@ yyreduce:
 
 		     delete id; id = 0;
 		 }
-#line 1734 "dds.tab.cc" /* yacc.c:1661  */
+#line 1734 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 405 "dds.yy" /* yacc.c:1661  */
+#line 405 "dds.yy" /* yacc.c:1646  */
     {
 		     (yyval.boolean) = true;
 		 }
-#line 1742 "dds.tab.cc" /* yacc.c:1661  */
+#line 1742 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 410 "dds.yy" /* yacc.c:1661  */
+#line 410 "dds.yy" /* yacc.c:1646  */
     {
 		     ostringstream msg;
 		     msg << "In the dataset descriptor object:" << endl
@@ -1750,23 +1750,23 @@ yyreduce:
 		     parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
 		     YYABORT;
 		 }
-#line 1754 "dds.tab.cc" /* yacc.c:1661  */
+#line 1754 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 419 "dds.yy" /* yacc.c:1661  */
+#line 419 "dds.yy" /* yacc.c:1646  */
     { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true;}
-#line 1760 "dds.tab.cc" /* yacc.c:1661  */
+#line 1760 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 420 "dds.yy" /* yacc.c:1661  */
+#line 420 "dds.yy" /* yacc.c:1646  */
     { (*DDS_OBJ(arg)).set_dataset_name((yyvsp[0].word)); (yyval.boolean) = true; }
-#line 1766 "dds.tab.cc" /* yacc.c:1661  */
+#line 1766 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 422 "dds.yy" /* yacc.c:1661  */
+#line 422 "dds.yy" /* yacc.c:1646  */
     {
 		    ostringstream msg;
 		    msg << "Error parsing the dataset name." << endl
@@ -1774,11 +1774,11 @@ yyreduce:
 		    parse_error((parser_arg *)arg, msg.str().c_str(), dds_line_num, (yyvsp[0].word));
 		    YYABORT;
 		}
-#line 1778 "dds.tab.cc" /* yacc.c:1661  */
+#line 1778 "dds.tab.cc" /* yacc.c:1646  */
     break;
 
 
-#line 1782 "dds.tab.cc" /* yacc.c:1661  */
+#line 1782 "dds.tab.cc" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/dds.tab.hh b/dds.tab.hh
index 4d35647..436a5b4 100644
--- a/dds.tab.hh
+++ b/dds.tab.hh
@@ -40,7 +40,7 @@
 extern int ddsdebug;
 #endif
 /* "%code requires" blocks.  */
-#line 47 "dds.yy" /* yacc.c:1915  */
+#line 47 "dds.yy" /* yacc.c:1909  */
 
 
 #include "config_dap.h"
@@ -86,7 +86,7 @@ using namespace libdap;
 extern int dds_line_num;	/* defined in dds.lex */
 
 
-#line 90 "dds.tab.hh" /* yacc.c:1915  */
+#line 90 "dds.tab.hh" /* yacc.c:1909  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -117,12 +117,12 @@ extern int dds_line_num;	/* defined in dds.lex */
 
 union YYSTYPE
 {
-#line 131 "dds.yy" /* yacc.c:1915  */
+#line 131 "dds.yy" /* yacc.c:1909  */
 
     bool boolean;
     char word[ID_MAX];
 
-#line 126 "dds.tab.hh" /* yacc.c:1915  */
+#line 126 "dds.tab.hh" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/gl/Makefile.in b/gl/Makefile.in
index 47cf3b8..e6aa36c 100644
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
@@ -573,7 +573,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/lex.Error.cc b/lex.Error.cc
index 6242fd3..d691f67 100644
--- a/lex.Error.cc
+++ b/lex.Error.cc
@@ -66,7 +66,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -173,12 +172,7 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t Errorleng;
+extern int Errorleng;
 
 extern FILE *Errorin, *Errorout;
 
@@ -204,6 +198,11 @@ extern FILE *Errorin, *Errorout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -221,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -291,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when Errortext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t Errorleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int Errorleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -320,7 +319,7 @@ static void Error_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE Error_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE Error_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE Error_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE Error_scan_bytes (yyconst char *bytes,int len  );
 
 void *Erroralloc (yy_size_t  );
 void *Errorrealloc (void *,yy_size_t  );
@@ -379,7 +378,7 @@ static void yy_fatal_error (yyconst char msg[]  );
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
 	(yytext_ptr) -= (yy_more_len); \
-	Errorleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	Errorleng = (size_t) (yy_cp - (yytext_ptr)); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -594,7 +593,7 @@ void store_string();
 #define YY_NO_INPUT 1
 
 
-#line 598 "lex.Error.cc"
+#line 597 "lex.Error.cc"
 
 #define INITIAL 0
 #define quote 1
@@ -635,7 +634,7 @@ FILE *Errorget_out (void );
 
 void Errorset_out  (FILE * out_str  );
 
-yy_size_t Errorget_leng (void );
+int Errorget_leng (void );
 
 char *Errorget_text (void );
 
@@ -683,7 +682,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( Errortext, Errorleng, 1, Errorout )
+#define ECHO do { if (fwrite( Errortext, Errorleng, 1, Errorout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -694,7 +693,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( Errorin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -780,7 +779,7 @@ YY_DECL
 
 
 
-#line 784 "lex.Error.cc"
+#line 783 "lex.Error.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1001,7 +1000,7 @@ YY_RULE_SETUP
 #line 144 "Error.lex"
 ECHO;
 	YY_BREAK
-#line 1005 "lex.Error.cc"
+#line 1004 "lex.Error.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1185,7 +1184,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1199,7 +1198,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1230,7 +1229,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1352,7 +1351,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1376,7 +1375,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( Errorwrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1628,7 +1627,7 @@ void Errorpop_buffer_state (void)
  */
 static void Errorensure_buffer_stack (void)
 {
-	yy_size_t num_to_alloc;
+	int num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -1725,11 +1724,12 @@ YY_BUFFER_STATE Error_scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE Error_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE Error_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1811,7 +1811,7 @@ FILE *Errorget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t Errorget_leng  (void)
+int Errorget_leng  (void)
 {
         return Errorleng;
 }
diff --git a/lex.ce_expr.cc b/lex.ce_expr.cc
index db7b906..6594a76 100644
--- a/lex.ce_expr.cc
+++ b/lex.ce_expr.cc
@@ -66,7 +66,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -173,12 +172,7 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t ce_exprleng;
+extern int ce_exprleng;
 
 extern FILE *ce_exprin, *ce_exprout;
 
@@ -204,6 +198,11 @@ extern FILE *ce_exprin, *ce_exprout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -221,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -291,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when ce_exprtext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t ce_exprleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int ce_exprleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -320,7 +319,7 @@ static void ce_expr_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE ce_expr_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE ce_expr_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE ce_expr_scan_bytes (yyconst char *bytes,int len  );
 
 void *ce_expralloc (yy_size_t  );
 void *ce_exprrealloc (void *,yy_size_t  );
@@ -379,7 +378,7 @@ static void yy_fatal_error (yyconst char msg[]  );
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
 	(yytext_ptr) -= (yy_more_len); \
-	ce_exprleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	ce_exprleng = (size_t) (yy_cp - (yytext_ptr)); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -612,7 +611,7 @@ static void store_op(int op);
    scanners, but not here because it'll conflict with the url dereference
    operator. 6/10/2002 jhrg
 */
-#line 616 "lex.ce_expr.cc"
+#line 615 "lex.ce_expr.cc"
 
 #define INITIAL 0
 #define quote 1
@@ -652,7 +651,7 @@ FILE *ce_exprget_out (void );
 
 void ce_exprset_out  (FILE * out_str  );
 
-yy_size_t ce_exprget_leng (void );
+int ce_exprget_leng (void );
 
 char *ce_exprget_text (void );
 
@@ -700,7 +699,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( ce_exprtext, ce_exprleng, 1, ce_exprout )
+#define ECHO do { if (fwrite( ce_exprtext, ce_exprleng, 1, ce_exprout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -711,7 +710,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( ce_exprin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -796,7 +795,7 @@ YY_DECL
 #line 130 "ce_expr.lex"
 
 
-#line 800 "lex.ce_expr.cc"
+#line 799 "lex.ce_expr.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1070,7 +1069,7 @@ YY_RULE_SETUP
 #line 190 "ce_expr.lex"
 ECHO;
 	YY_BREAK
-#line 1074 "lex.ce_expr.cc"
+#line 1073 "lex.ce_expr.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1254,7 +1253,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1268,7 +1267,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1299,7 +1298,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1421,7 +1420,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1445,7 +1444,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( ce_exprwrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1697,7 +1696,7 @@ void ce_exprpop_buffer_state (void)
  */
 static void ce_exprensure_buffer_stack (void)
 {
-	yy_size_t num_to_alloc;
+	int num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -1794,11 +1793,12 @@ YY_BUFFER_STATE ce_expr_scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE ce_expr_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE ce_expr_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1880,7 +1880,7 @@ FILE *ce_exprget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t ce_exprget_leng  (void)
+int ce_exprget_leng  (void)
 {
         return ce_exprleng;
 }
diff --git a/lex.das.cc b/lex.das.cc
index 155ae81..d8623fa 100644
--- a/lex.das.cc
+++ b/lex.das.cc
@@ -66,7 +66,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -173,12 +172,7 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t dasleng;
+extern int dasleng;
 
 extern FILE *dasin, *dasout;
 
@@ -204,6 +198,11 @@ extern FILE *dasin, *dasout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -221,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -291,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when dastext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t dasleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int dasleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -320,7 +319,7 @@ static void das_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE das_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE das_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE das_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE das_scan_bytes (yyconst char *bytes,int len  );
 
 void *dasalloc (yy_size_t  );
 void *dasrealloc (void *,yy_size_t  );
@@ -379,7 +378,7 @@ static void yy_fatal_error (yyconst char msg[]  );
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
 	(yytext_ptr) -= (yy_more_len); \
-	dasleng = (yy_size_t) (yy_cp - (yytext_ptr)); \
+	dasleng = (size_t) (yy_cp - (yytext_ptr)); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -712,7 +711,7 @@ static int start_line;		/* used in quote and comment error handlers */
    parens and colons while the DDS and expr scanners don't. It's too hard to
    disambiguate functions when IDs have parens in them and adding colons
    makes parsing the array projections hard. 10/31/2001 jhrg */
-#line 716 "lex.das.cc"
+#line 715 "lex.das.cc"
 
 #define INITIAL 0
 #define quote 1
@@ -754,7 +753,7 @@ FILE *dasget_out (void );
 
 void dasset_out  (FILE * out_str  );
 
-yy_size_t dasget_leng (void );
+int dasget_leng (void );
 
 char *dasget_text (void );
 
@@ -802,7 +801,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( dastext, dasleng, 1, dasout )
+#define ECHO do { if (fwrite( dastext, dasleng, 1, dasout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -813,7 +812,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( dasin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -898,7 +897,7 @@ YY_DECL
 #line 136 "das.lex"
 
 
-#line 902 "lex.das.cc"
+#line 901 "lex.das.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1182,7 +1181,7 @@ YY_RULE_SETUP
 #line 200 "das.lex"
 ECHO;
 	YY_BREAK
-#line 1186 "lex.das.cc"
+#line 1185 "lex.das.cc"
 case YY_STATE_EOF(xml):
 	yyterminate();
 
@@ -1368,7 +1367,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1382,7 +1381,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1413,7 +1412,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1535,7 +1534,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1559,7 +1558,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( daswrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1811,7 +1810,7 @@ void daspop_buffer_state (void)
  */
 static void dasensure_buffer_stack (void)
 {
-	yy_size_t num_to_alloc;
+	int num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -1908,11 +1907,12 @@ YY_BUFFER_STATE das_scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE das_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE das_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1994,7 +1994,7 @@ FILE *dasget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t dasget_leng  (void)
+int dasget_leng  (void)
 {
         return dasleng;
 }
diff --git a/lex.dds.cc b/lex.dds.cc
index f02a51b..3992803 100644
--- a/lex.dds.cc
+++ b/lex.dds.cc
@@ -66,7 +66,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -173,12 +172,7 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t ddsleng;
+extern int ddsleng;
 
 extern FILE *ddsin, *ddsout;
 
@@ -204,6 +198,11 @@ extern FILE *ddsin, *ddsout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -221,7 +220,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -291,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when ddstext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t ddsleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int ddsleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -320,7 +319,7 @@ static void dds_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE dds_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE dds_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE dds_scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE dds_scan_bytes (yyconst char *bytes,int len  );
 
 void *ddsalloc (yy_size_t  );
 void *ddsrealloc (void *,yy_size_t  );
@@ -378,7 +377,7 @@ static void yy_fatal_error (yyconst char msg[]  );
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	ddsleng = (yy_size_t) (yy_cp - yy_bp); \
+	ddsleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -684,7 +683,7 @@ static void store_word();
 
 /* See das.lex for comments about the characters allowed in a WORD.
    10/31/2001 jhrg */
-#line 688 "lex.dds.cc"
+#line 687 "lex.dds.cc"
 
 #define INITIAL 0
 #define comment 1
@@ -724,7 +723,7 @@ FILE *ddsget_out (void );
 
 void ddsset_out  (FILE * out_str  );
 
-yy_size_t ddsget_leng (void );
+int ddsget_leng (void );
 
 char *ddsget_text (void );
 
@@ -772,7 +771,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( ddstext, ddsleng, 1, ddsout )
+#define ECHO do { if (fwrite( ddstext, ddsleng, 1, ddsout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -783,7 +782,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( ddsin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -868,7 +867,7 @@ YY_DECL
 #line 120 "dds.lex"
 
 
-#line 872 "lex.dds.cc"
+#line 871 "lex.dds.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1124,7 +1123,7 @@ YY_RULE_SETUP
 #line 165 "dds.lex"
 ECHO;
 	YY_BREAK
-#line 1128 "lex.dds.cc"
+#line 1127 "lex.dds.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1308,7 +1307,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1322,7 +1321,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1353,7 +1352,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1475,7 +1474,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1499,7 +1498,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( ddswrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1751,7 +1750,7 @@ void ddspop_buffer_state (void)
  */
 static void ddsensure_buffer_stack (void)
 {
-	yy_size_t num_to_alloc;
+	int num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -1848,11 +1847,12 @@ YY_BUFFER_STATE dds_scan_string (yyconst char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE dds_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE dds_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -1934,7 +1934,7 @@ FILE *ddsget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t ddsget_leng  (void)
+int ddsget_leng  (void)
 {
         return ddsleng;
 }
diff --git a/libdap.spec b/libdap.spec
index 0b5a755..f7d424d 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,6 +1,6 @@
 Name: libdap
 Summary: The C++ DAP2/DAP4 library from OPeNDAP
-Version: 3.18.0
+Version: 3.18.2
 Release: 1%{?dist}
 
 License: LGPLv2+
diff --git a/tests/DASTest b/tests/DASTest
index 3d9807d..23635d6 100755
--- a/tests/DASTest
+++ b/tests/DASTest
@@ -1,17 +1,17 @@
 #! /bin/sh
-# Generated from DASTest.at by GNU Autoconf 2.69.
-#
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Generated from DASTest.at by GNU Autoconf 2.63.
 #
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,15 +19,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -35,13 +43,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -52,7 +54,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -75,6 +77,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -84,16 +93,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -105,16 +113,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -126,319 +130,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+if as_func_success; then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+if as_func_ret_success; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
+
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
+fi
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-} # as_fn_mkdir_p
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
+if as_func_ret_success; then
+  :
 else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
 
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -455,12 +470,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -469,18 +482,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -495,29 +519,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -547,11 +591,6 @@ at_errexit_p=false
 # Shall we be verbose?  ':' means no, empty means yes.
 at_verbose=:
 at_quiet=
-# Running several jobs in parallel, 0 means as many as test groups.
-at_jobs=1
-at_traceon=:
-at_trace_echo=:
-at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -566,8 +605,6 @@ at_list_p=false
 at_clean=false
 # Test groups to run
 at_groups=
-# Whether to rerun failed tests.
-at_recheck=
 # Whether a write failure occurred
 at_write_fail=0
 
@@ -581,10 +618,10 @@ esac
 # Whether -C is in effect.
 at_change_dir=false
 
-# Whether to enable colored test results.
-at_color=no
 # List of the tested programs.
 at_tested=''
+# List of the all the test groups.
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -631,14 +668,12 @@ at_help_all="1;DASTest.at:31;DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das
 39;DASTest.at:69;DAS \$abs_srcdir/das-testsuite/test.8.das;das;
 40;DASTest.at:70;DAS \$abs_srcdir/das-testsuite/test.9.das;das;
 "
-# List of the all the test groups.
-at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
 
-# at_fn_validate_ranges NAME...
-# -----------------------------
-# Validate and normalize the test group number contained in each variable
-# NAME. Leading zeroes are treated as decimal.
-at_fn_validate_ranges ()
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME.  Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
 {
   for at_grp
   do
@@ -649,7 +684,7 @@ at_fn_validate_ranges ()
     fi
     case $at_value in
       0*) # We want to treat leading 0 as decimal, like expr and test, but
-	  # AS_VAR_ARITH treats it as octal if it uses $(( )).
+	  # at_func_arith treats it as octal if it uses $(( )).
 	  # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
 	  # expr fork, but it is not worth the effort to determine if the
 	  # shell supports XSI when the user can just avoid leading 0.
@@ -668,8 +703,8 @@ do
   fi
 
   case $at_option in
-  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
-  *)    at_optarg= ;;
+  *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
+  *)   at_optarg= ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -691,19 +726,6 @@ do
 	at_clean=:
 	;;
 
-    --color )
-	at_color=always
-	;;
-    --color=* )
-	case $at_optarg in
-	no | never | none) at_color=never ;;
-	auto | tty | if-tty) at_color=auto ;;
-	always | yes | force) at_color=always ;;
-	*) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
-	   as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
-	esac
-	;;
-
     --debug | -d )
 	at_debug_p=:
 	;;
@@ -718,31 +740,29 @@ do
 	;;
 
     --trace | -x )
-	at_traceon='set -x'
-	at_trace_echo=echo
-	at_check_filter_trace=at_fn_filter_trace
+	at_traceon='set -x'; at_traceoff='set +x'
 	;;
 
     [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
-	at_fn_validate_ranges at_option
-	as_fn_append at_groups "$at_option$as_nl"
+	at_func_validate_ranges at_option
+	at_groups="$at_groups$at_option "
 	;;
 
     # Ranges
     [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
 	at_range_start=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_start
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,$p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.* \('$at_range_start' \)/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
 	at_range_end=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '1,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -758,10 +778,11 @@ do
 	  at_range_end=$at_range_start
 	  at_range_start=$at_tmp
 	fi
-	at_fn_validate_ranges at_range_start at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.*\( '$at_range_start' \)/\1/' \
+	      -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     # Directory selection.
@@ -771,25 +792,6 @@ do
     --directory=* )
 	at_change_dir=:
 	at_dir=$at_optarg
-	if test x- = "x$at_dir" ; then
-	  at_dir=./-
-	fi
-	;;
-
-    # Parallel execution.
-    --jobs | -j )
-	at_jobs=0
-	;;
-    --jobs=* | -j[0-9]* )
-	if test -n "$at_optarg"; then
-	  at_jobs=$at_optarg
-	else
-	  at_jobs=`expr X$at_option : 'X-j\(.*\)'`
-	fi
-	case $at_jobs in *[!0-9]*)
-	  at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
-	  as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
-	esac
 	;;
 
     # Keywords.
@@ -816,12 +818,11 @@ do
 	  at_groups_selected=`$as_echo "$at_groups_selected" |
 	      grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
 	done
-	# Smash the keywords.
-	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-	as_fn_append at_groups "$at_groups_selected$as_nl"
-	;;
-    --recheck)
-	at_recheck=:
+	# Smash the newlines.
+	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+	  tr "$as_nl" ' '
+	`
+	at_groups="$at_groups$at_groups_selected "
 	;;
 
     *=*)
@@ -829,12 +830,14 @@ do
 	# Reject names that are not valid shell variable names.
 	case $at_envvar in
 	  '' | [0-9]* | *[!_$as_cr_alnum]* )
-	    as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
+	    { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+   { (exit 1); exit 1; }; } ;;
 	esac
 	at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
 	# Export now, but save eval for later and for debug scripts.
 	export $at_envvar
-	as_fn_append at_debug_args " $at_envvar='$at_value'"
+	at_debug_args="$at_debug_args $at_envvar='$at_value'"
 	;;
 
      *) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -845,42 +848,19 @@ do
 done
 
 # Verify our last option didn't require an argument
-if test -n "$at_prev"; then :
-  as_fn_error $? "\`$at_prev' requires an argument"
+if test -n "$at_prev"; then
+  { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
 
 # Selected test groups.
-if test -z "$at_groups$at_recheck"; then
+if test -z "$at_groups"; then
   at_groups=$at_groups_all
 else
-  if test -n "$at_recheck" && test -r "$at_suite_log"; then
-    at_oldfails=`sed -n '
-      /^Failed tests:$/,/^Skipped tests:$/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^Unexpected passes:$/,/^## Detailed failed tests/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^## Detailed failed tests/q
-      ' "$at_suite_log"`
-    as_fn_append at_groups "$at_oldfails$as_nl"
-  fi
   # Sort the tests, removing duplicates.
-  at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
-fi
-
-if test x"$at_color" = xalways \
-   || { test x"$at_color" = xauto && test -t 1; }; then
-  at_red=`printf '\033[0;31m'`
-  at_grn=`printf '\033[0;32m'`
-  at_lgn=`printf '\033[1;32m'`
-  at_blu=`printf '\033[1;34m'`
-  at_std=`printf '\033[m'`
-else
-  at_red= at_grn= at_lgn= at_blu= at_std=
+  at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
 fi
 
 # Help message.
@@ -891,17 +871,16 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
 Run all the tests, or the selected TESTS, given by numeric ranges, and
 save a detailed log file.  Upon failure, create debugging scripts.
 
-Do not change environment variables directly.  Instead, set them via
-command line arguments.  Set \`AUTOTEST_PATH' to select the executables
+You should not change environment variables unless explicitly passed
+as command line arguments.  Set \`AUTOTEST_PATH' to select the executables
 to exercise.  Each relative directory is expanded as build and source
-directories relative to the top level of this distribution.
-E.g., from within the build directory /tmp/foo-1.0, invoking this:
+directories relatively to the top level of this distribution.  E.g.,
 
   $ $0 AUTOTEST_PATH=bin
 
-is equivalent to the following, assuming the source directory is /src/foo-1.0:
+possibly amounts into
 
-  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
 _ATEOF
 cat <<_ATEOF || at_write_fail=1
 
@@ -916,14 +895,9 @@ cat <<_ATEOF || at_write_fail=1
 Execution tuning:
   -C, --directory=DIR
                  change to directory DIR before starting
-      --color[=never|auto|always]
-                 enable colored test results on terminal, or always
-  -j, --jobs[=N]
-                 Allow N jobs at once; infinite jobs with no arg (default 1)
   -k, --keywords=KEYWORDS
                  select the tests matching all the comma-separated KEYWORDS
                  multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-      --recheck  select all tests that failed or passed unexpectedly last time
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
                  default for debugging scripts
@@ -941,69 +915,64 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-libdap 3.18.1 test suite: das-test test groups:
+libdap 3.18.2 test suite: das-test test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
-  # Pass an empty line as separator between selected groups and help.
-  $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-    awk 'NF == 1 && FS != ";" {
-	   selected[$ 1] = 1
+  # Passing at_groups is tricky.  We cannot use it to form a literal string
+  # or regexp because of the limitation of AIX awk.  And Solaris' awk
+  # doesn't grok more than 99 fields in a record, so we have to use `split'.
+  # at_groups needs to be space-separated for this script to work.
+  case $at_groups in
+    *"$as_nl"* )
+      at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+  esac
+  $as_echo "$at_groups$as_nl$at_help_all" |
+    awk 'BEGIN { FS = ";" }
+	 NR == 1 {
+	   for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
 	   next
 	 }
-	 /^$/ { FS = ";" }
-	 NF > 0 {
+	 {
 	   if (selected[$ 1]) {
 	     printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-	     if ($ 4) {
-	       lmax = 79
-	       indent = "     "
-	       line = indent
-	       len = length (line)
-	       n = split ($ 4, a, " ")
-	       for (i = 1; i <= n; i++) {
-		 l = length (a[i]) + 1
-		 if (i > 1 && len + l > lmax) {
-		   print line
-		   line = indent " " a[i]
-		   len = length (line)
-		 } else {
-		   line = line " " a[i]
-		   len += l
-		 }
-	       }
-	       if (n)
-		 print line
-	     }
+	     if ($ 4) printf "      %s\n", $ 4
 	   }
 	 }' || at_write_fail=1
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (libdap 3.18.1)" &&
-  cat <<\_ATEOF || at_write_fail=1
+  $as_echo "$as_me (libdap 3.18.2)" &&
+  cat <<\_ACEOF || at_write_fail=1
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
-_ATEOF
+_ACEOF
   exit $at_write_fail
 fi
 
-# Should we print banners?  Yes if more than one test is run.
-case $at_groups in #(
-  *$as_nl* )
-      at_print_banners=: ;; #(
+# Should we print banners?  at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+  *' '*' '* | *"$as_nl"*"$as_nl"* )
+      at_print_banners=: ;;
   * ) at_print_banners=false ;;
 esac
-# Text for banner N, set to a single space once printed.
+# Text for banner N, set to empty once printed.
 
 # Take any -C into account.
 if $at_change_dir ; then
+  if test x- = "x$at_dir" ; then
+    at_dir=./-
+  fi
   test x != "x$at_dir" && cd "$at_dir" \
-    || as_fn_error $? "unable to change directory"
+    || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+   { (exit 1); exit 1; }; }
   at_dir=`pwd`
 fi
 
@@ -1011,11 +980,13 @@ fi
 for at_file in atconfig atlocal
 do
   test -r $at_file || continue
-  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+  . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+   { (exit 1); exit 1; }; }
 done
 
 # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: "${at_top_build_prefix=$at_top_builddir}"
+: ${at_top_build_prefix=$at_top_builddir}
 
 # Perform any assignments requested during argument parsing.
 eval "$at_debug_args"
@@ -1026,7 +997,8 @@ if test -n "$at_top_srcdir"; then
   builddir=../..
   for at_dir_var in srcdir top_srcdir top_build_prefix
   do
-    eval at_val=\$at_$at_dir_var
+    at_val=`eval 'as_val=${'at_$at_dir_var'}
+		 $as_echo "$as_val"'`
     case $at_val in
       [\\/$]* | ?:[\\/]* ) at_prefix= ;;
       *) at_prefix=../../ ;;
@@ -1035,9 +1007,9 @@ if test -n "$at_top_srcdir"; then
   done
 fi
 
-## -------------------- ##
-## Directory structure. ##
-## -------------------- ##
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
 
 # This is the set of directories and files used by this script
 # (non-literals are capitalized):
@@ -1068,14 +1040,12 @@ fi
 # The directory the whole suite works in.
 # Should be absolute to let the user `cd' at will.
 at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite ($at_dir might have changed since earlier).
+# The file containing the suite.
 at_suite_log=$at_dir/$as_me.log
 # The directory containing helper files per test group.
 at_helper_dir=$at_suite_dir/at-groups
 # Stop file: if it exists, do not start new jobs.
 at_stop_file=$at_suite_dir/at-stop
-# The fifo used for the job dispatcher.
-at_job_fifo=$at_suite_dir/at-job-fifo
 
 if $at_clean; then
   test -d "$at_suite_dir" &&
@@ -1099,23 +1069,23 @@ for as_dir in $AUTOTEST_PATH $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
+  test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
 case $as_dir in
   [\\/]* | ?:[\\/]* )
-    as_fn_append at_path "$as_dir"
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_build_prefix"; then
       # Stand-alone test suite.
-      as_fn_append at_path "$as_dir"
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
-      as_fn_append at_path "$at_top_srcdir/$as_dir"
+      at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 
@@ -1129,7 +1099,7 @@ for as_dir in $at_path
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -d "$as_dir" || continue
+  test -d "$as_dir" || continue
 case $as_dir in
   [\\/]* | ?:[\\/]* ) ;;
   * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1137,18 +1107,15 @@ esac
 case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
   *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
   $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
-  *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
+  *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-
-
-
 # 5 is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
@@ -1158,28 +1125,43 @@ fi
 exec 5>>"$at_suite_log"
 
 # Banners and logs.
-$as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: das-test. ##
-## ----------------------------------- ##"
+cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: das-test. ##
+## ----------------------------------- ##
+_ASBOX
 {
-  $as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: das-test. ##
-## ----------------------------------- ##"
+  cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: das-test. ##
+## ----------------------------------- ##
+_ASBOX
   echo
 
   $as_echo "$as_me: command line was:"
   $as_echo "  \$ $0 $at_cli_args"
   echo
 
-  # If ChangeLog exists, list a few lines in case it might help determining
-  # the exact version.
-  if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
-    $as_echo "## ---------- ##
-## ChangeLog. ##
-## ---------- ##"
-    echo
-    sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
+  # Try to find a few ChangeLogs in case it might help determining the
+  # exact version.  Use the relative dir: if the top dir is a symlink,
+  # find will not follow it (and options to follow the links are not
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
+  if test -n "$at_top_srcdir"; then
+    cat <<\_ASBOX
+## ----------- ##
+## ChangeLogs. ##
+## ----------- ##
+_ASBOX
     echo
+    for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
+    do
+      $as_echo "$as_me: $at_file:"
+      sed 's/^/| /;10q' $at_file
+      echo
+    done
+
   fi
 
   {
@@ -1212,8 +1194,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 }
@@ -1230,80 +1212,53 @@ IFS=$as_save_IFS
 } >&5
 
 
-## ------------------------- ##
-## Autotest shell functions. ##
-## ------------------------- ##
+## --------------- ##
+## Shell functions ##
+## --------------- ##
 
-# at_fn_banner NUMBER
-# -------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups and
-# this particular banner has not yet been printed.
-at_fn_banner ()
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
 {
   $at_print_banners || return 0
   eval at_banner_text=\$at_banner_text_$1
-  test "x$at_banner_text" = "x " && return 0
-  eval "at_banner_text_$1=\" \""
-  if test -z "$at_banner_text"; then
-    $at_first || echo
-  else
-    $as_echo "$as_nl$at_banner_text$as_nl"
-  fi
-} # at_fn_banner
-
-# at_fn_check_prepare_notrace REASON LINE
-# ---------------------------------------
-# Perform AT_CHECK preparations for the command at LINE for an untraceable
-# command; REASON is the reason for disabling tracing.
-at_fn_check_prepare_notrace ()
-{
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
-  $as_echo "$2" >"$at_check_line_file"
-  at_check_trace=: at_check_filter=:
-  : >"$at_stdout"; : >"$at_stderr"
-}
-
-# at_fn_check_prepare_trace LINE
-# ------------------------------
-# Perform AT_CHECK preparations for the command at LINE for a traceable
-# command.
-at_fn_check_prepare_trace ()
-{
-  $as_echo "$1" >"$at_check_line_file"
-  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
-  : >"$at_stdout"; : >"$at_stderr"
-}
+  test "x$at_banner_text" = x && return 0
+  eval at_banner_text_$1=
+  $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
 
-# at_fn_check_prepare_dynamic COMMAND LINE
-# ----------------------------------------
-# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
-# preparation function.
-at_fn_check_prepare_dynamic ()
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
 {
-  case $1 in
-    *$as_nl*)
-      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
-    *)
-      at_fn_check_prepare_trace "$2" ;;
+  case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+    return 1 ;;
+ *) return 0 ;;
   esac
 }
 
-# at_fn_filter_trace
-# ------------------
-# Remove the lines in the file "$at_stderr" generated by "set -x" and print
-# them to stderr.
-at_fn_filter_trace ()
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr").  Return the exit code EXIT-CODE.
+at_func_filter_trace ()
 {
-  mv "$at_stderr" "$at_stder1"
   grep '^ *+' "$at_stder1" >&2
   grep -v '^ *+' "$at_stder1" >"$at_stderr"
+  return $1
 }
 
-# at_fn_log_failure FILE-LIST
-# ---------------------------
+# at_func_log_failure FILE-LIST
+# -----------------------------
 # Copy the files in the list on stdout with a "> " prefix, and exit the shell
 # with a failure exit code.
-at_fn_log_failure ()
+at_func_log_failure ()
 {
   for file
     do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1311,62 +1266,56 @@ at_fn_log_failure ()
   exit 1
 }
 
-# at_fn_check_skip EXIT-CODE LINE
-# -------------------------------
-# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
-# the test group subshell with that same exit code. Use LINE in any report
-# about test failure.
-at_fn_check_skip ()
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
 {
   case $1 in
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$2: hard failure"; exit 99;;
     77) echo 77 > "$at_status_file"; exit 77;;
   esac
 }
 
-# at_fn_check_status EXPECTED EXIT-CODE LINE
-# ------------------------------------------
-# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
-# Otherwise, if it is 77 or 99, exit the test group subshell with that same
-# exit code; if it is anything else print an error message referring to LINE,
-# and fail the test.
-at_fn_check_status ()
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
 {
   case $2 in
     $1 ) ;;
     77) echo 77 > "$at_status_file"; exit 77;;
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$3: hard failure"; exit 99;;
     *) $as_echo "$3: exit code was $2, expected $1"
       at_failed=:;;
   esac
 }
 
-# at_fn_diff_devnull FILE
-# -----------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
-# invocations.
-at_fn_diff_devnull ()
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE.  Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
 {
   test -s "$1" || return 0
   $at_diff "$at_devnull" "$1"
 }
 
-# at_fn_test NUMBER
-# -----------------
+# at_func_test NUMBER
+# -------------------
 # Parse out test NUMBER from the tail of this file.
-at_fn_test ()
+at_func_test ()
 {
   eval at_sed=\$at_sed$1
   sed "$at_sed" "$at_myself" > "$at_test_source"
 }
 
-# at_fn_create_debugging_script
-# -----------------------------
+# at_func_create_debugging_script
+# -------------------------------
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
-at_fn_create_debugging_script ()
+at_func_create_debugging_script ()
 {
   {
     echo "#! /bin/sh" &&
@@ -1378,13 +1327,34 @@ at_fn_create_debugging_script ()
   chmod +x "$at_group_dir/run"
 }
 
-## -------------------------------- ##
-## End of autotest shell functions. ##
-## -------------------------------- ##
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.  The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  # With "$@", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $* ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "$@"`
+  }
+fi
+
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
 {
-  $as_echo "## ---------------- ##
+  cat <<\_ASBOX
+## ---------------- ##
 ## Tested programs. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1392,35 +1362,34 @@ at_fn_create_debugging_script ()
 for at_program in : $at_tested
 do
   test "$at_program" = : && continue
-  case $at_program in
-    [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
-    * )
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -f "$as_dir/$at_program" && break
-  done
+  test -f "$as_dir/$at_program" && break
+done
 IFS=$as_save_IFS
 
-    at_program_=$as_dir/$at_program ;;
-  esac
-  if test -f "$at_program_"; then
+  if test -f "$as_dir/$at_program"; then
     {
-      $as_echo "$at_srcdir/DASTest.at:7: $at_program_ --version"
-      "$at_program_" --version </dev/null
+      $as_echo "$at_srcdir/DASTest.at:7: $as_dir/$at_program --version"
+      "$as_dir/$at_program" --version </dev/null
       echo
     } >&5 2>&1
   else
-    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 done
 
 {
-  $as_echo "## ------------------ ##
+  cat <<\_ASBOX
+## ------------------ ##
 ## Running the tests. ##
-## ------------------ ##"
+## ------------------ ##
+_ASBOX
 } >&5
 
 at_start_date=`date`
@@ -1428,8 +1397,11 @@ at_start_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: starting at: $at_start_date" >&5
 
 # Create the master directory if it doesn't already exist.
-as_dir="$at_suite_dir"; as_fn_mkdir_p ||
-  as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
+test -d "$at_suite_dir" ||
+  mkdir "$at_suite_dir" ||
+  { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
 if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1463,40 +1435,28 @@ BEGIN { FS="" }
   if (test == "'"$at_group"'") exit
 }' "$at_myself" > "$at_suite_dir/at-source-lines" &&
 . "$at_suite_dir/at-source-lines" ||
-  as_fn_error $? "cannot create test line number cache" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+   { (exit 1); exit 1; }; }
 rm -f "$at_suite_dir/at-source-lines"
 
-# Set number of jobs for `-j'; avoid more jobs than test groups.
-set X $at_groups; shift; at_max_jobs=$#
-if test $at_max_jobs -eq 0; then
-  at_jobs=1
-fi
-if test $at_jobs -ne 1 &&
-   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
-  at_jobs=$at_max_jobs
-fi
-
-# If parallel mode, don't output banners, don't split summary lines.
-if test $at_jobs -ne 1; then
-  at_print_banners=false
-  at_quiet=:
-fi
-
 # Set up helper dirs.
 rm -rf "$at_helper_dir" &&
 mkdir "$at_helper_dir" &&
 cd "$at_helper_dir" &&
 { test -z "$at_groups" || mkdir $at_groups; } ||
-as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Functions for running a test group.  We leave the actual
 # test group execution outside of a shell function in order
 # to avoid hitting zsh 4.x exit status bugs.
 
-# at_fn_group_prepare
-# -------------------
-# Prepare for running a test group.
-at_fn_group_prepare ()
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
 {
   # The directory for additional per-group helper files.
   at_job_dir=$at_helper_dir/$at_group
@@ -1530,20 +1490,56 @@ at_fn_group_prepare ()
 
 
   # Create a fresh directory for the next test group, and enter.
-  # If one already exists, the user may have invoked ./run from
-  # within that directory; we remove the contents, but not the
-  # directory itself, so that we aren't pulling the rug out from
-  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
-  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
-  rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
-fi ||
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+    find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+    rm -fr "$at_group_dir" ||
+    { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+  fi
   # Be tolerant if the above `rm' was not able to remove the directory.
-  as_dir="$at_group_dir"; as_fn_mkdir_p
+  { as_dir="$at_group_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
   echo 0 > "$at_status_file"
 
@@ -1556,29 +1552,9 @@ $as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be
   fi
 }
 
-# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
-# -------------------------------------------------
-# Declare the test group ORDINAL, located at LINE with group description DESC,
-# and residing under BANNER. Use PAD to align the status column.
-at_fn_group_banner ()
-{
-  at_setup_line="$2"
-  test -n "$5" && at_fn_banner $5
-  at_desc="$3"
-  case $1 in
-    [0-9])      at_desc_line="  $1: ";;
-    [0-9][0-9]) at_desc_line=" $1: " ;;
-    *)          at_desc_line="$1: "  ;;
-  esac
-  as_fn_append at_desc_line "$3$4"
-  $at_quiet $as_echo_n "$at_desc_line"
-  echo "#                             -*- compilation -*-" >> "$at_group_log"
-}
-
-# at_fn_group_postprocess
-# -----------------------
-# Perform cleanup after running a test group.
-at_fn_group_postprocess ()
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
 {
   # Be sure to come back to the suite directory, in particular
   # since below we might `rm' the group directory we are in currently.
@@ -1591,7 +1567,6 @@ at_fn_group_postprocess ()
       report this failure to <opendap-tech at opendap.org>.
 _ATEOF
     $as_echo "$at_setup_line" >"$at_check_line_file"
-    at_status=99
   fi
   $at_verbose $as_echo_n "$at_group. $at_setup_line: "
   $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1600,41 +1575,31 @@ _ATEOF
 	at_msg="UNEXPECTED PASS"
 	at_res=xpass
 	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     no:0)
 	at_msg="ok"
 	at_res=pass
 	at_errexit=false
-	at_color=$at_grn
 	;;
     *:77)
 	at_msg='skipped ('`cat "$at_check_line_file"`')'
 	at_res=skip
 	at_errexit=false
-	at_color=$at_blu
-	;;
-    no:* | *:99)
-	at_msg='FAILED ('`cat "$at_check_line_file"`')'
-	at_res=fail
-	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     yes:*)
 	at_msg='expected failure ('`cat "$at_check_line_file"`')'
 	at_res=xfail
 	at_errexit=false
-	at_color=$at_lgn
+	;;
+    no:*)
+	at_msg='FAILED ('`cat "$at_check_line_file"`')'
+	at_res=fail
+	at_errexit=$at_errexit_p
 	;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
-  # In parallel mode, output the summary line only afterwards.
-  if test $at_jobs -ne 1 && test -n "$at_verbose"; then
-    $as_echo "$at_desc_line $at_color$at_msg$at_std"
-  else
-    # Make sure there is a separator even with long titles.
-    $as_echo " $at_color$at_msg$at_std"
-  fi
+  # Make sure there is a separator even with long titles.
+  $as_echo " $at_msg"
   at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
   case $at_status in
     0|77)
@@ -1649,13 +1614,9 @@ _ATEOF
       $as_echo "$at_log_msg" >> "$at_group_log"
       $as_echo "$at_log_msg" >&5
 
-      # Cleanup the group directory, unless the user wants the files
-      # or the success was unexpected.
-      if $at_debug_p || test $at_res = xpass; then
-	at_fn_create_debugging_script
-	if test $at_res = xpass && $at_errexit; then
-	  echo stop > "$at_stop_file"
-	fi
+      # Cleanup the group directory, unless the user wants the files.
+      if $at_debug_p; then
+	at_func_create_debugging_script
       else
 	if test -d "$at_group_dir"; then
 	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1672,7 +1633,7 @@ _ATEOF
 
       # Upon failure, keep the group directory for autopsy, and create
       # the debugging script.  With -e, do not start any further tests.
-      at_fn_create_debugging_script
+      at_func_create_debugging_script
       if $at_errexit; then
 	echo stop > "$at_stop_file"
       fi
@@ -1685,134 +1646,22 @@ _ATEOF
 ## Driver loop. ##
 ## ------------ ##
 
-
-if (set -m && set +m && set +b) >/dev/null 2>&1; then
-  set +b
-  at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
-else
-  at_job_control_on=: at_job_control_off=: at_job_group=
-fi
-
-for at_signal in 1 2 15; do
-  trap 'set +x; set +e
-	$at_job_control_off
-	at_signal='"$at_signal"'
-	echo stop > "$at_stop_file"
-	trap "" $at_signal
-	at_pgids=
-	for at_pgid in `jobs -p 2>/dev/null`; do
-	  at_pgids="$at_pgids $at_job_group$at_pgid"
-	done
-	test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
-	wait
-	if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
-	  echo >&2
-	fi
-	at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
-	set x $at_signame
-	test 1 -gt 2 && at_signame=$at_signal
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
-$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
-	as_fn_arith 128 + $at_signal && exit_status=$as_val
-	as_fn_exit $exit_status' $at_signal
-done
-
 rm -f "$at_stop_file"
 at_first=:
 
-if test $at_jobs -ne 1 &&
-     rm -f "$at_job_fifo" &&
-     test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
-then
-  # FIFO job dispatcher.
-
-  trap 'at_pids=
-	for at_pid in `jobs -p`; do
-	  at_pids="$at_pids $at_job_group$at_pid"
-	done
-	if test -n "$at_pids"; then
-	  at_sig=TSTP
-	  test "${TMOUT+set}" = set && at_sig=STOP
-	  kill -$at_sig $at_pids 2>/dev/null
-	fi
-	kill -STOP $$
-	test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
-
-  echo
-  # Turn jobs into a list of numbers, starting from 1.
-  at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
-  set X $at_joblist
-  shift
-  for at_group in $at_groups; do
-    $at_job_control_on 2>/dev/null
-    (
-      # Start one test group.
-      $at_job_control_off
-      if $at_first; then
-	exec 7>"$at_job_fifo"
-      else
-	exec 6<&-
-      fi
-      trap 'set +x; set +e
-	    trap "" PIPE
-	    echo stop > "$at_stop_file"
-	    echo >&7
-	    as_fn_exit 141' PIPE
-      at_fn_group_prepare
-      if cd "$at_group_dir" &&
-	 at_fn_test $at_group &&
-	 . "$at_test_source"
-      then :; else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+for at_group in $at_groups; do
+  at_func_group_prepare
+  if cd "$at_group_dir" &&
+     at_func_test $at_group &&
+     . "$at_test_source"; then :; else
+    { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
 $as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-	at_failed=:
-      fi
-      at_fn_group_postprocess
-      echo >&7
-    ) &
-    $at_job_control_off
-    if $at_first; then
-      at_first=false
-      exec 6<"$at_job_fifo" 7>"$at_job_fifo"
-    fi
-    shift # Consume one token.
-    if test $# -gt 0; then :; else
-      read at_token <&6 || break
-      set x $*
-    fi
-    test -f "$at_stop_file" && break
-  done
-  exec 7>&-
-  # Read back the remaining ($at_jobs - 1) tokens.
-  set X $at_joblist
-  shift
-  if test $# -gt 0; then
-    shift
-    for at_job
-    do
-      read at_token
-    done <&6
+    at_failed=:
   fi
-  exec 6<&-
-  wait
-else
-  # Run serially, avoid forks and other potential surprises.
-  for at_group in $at_groups; do
-    at_fn_group_prepare
-    if cd "$at_group_dir" &&
-       at_fn_test $at_group &&
-       . "$at_test_source"; then :; else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
-$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-      at_failed=:
-    fi
-    at_fn_group_postprocess
-    test -f "$at_stop_file" && break
-    at_first=false
-  done
-fi
+  at_func_group_postprocess
+  test -f "$at_stop_file" && break
+  at_first=false
+done
 
 # Wrap up the test suite with summary statistics.
 cd "$at_helper_dir"
@@ -1833,9 +1682,12 @@ set X $at_xfail_list; shift; at_xfail_count=$#
 set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
 set X $at_skip_list; shift; at_skip_count=$#
 
-as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
-as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
-as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 # Back to the top directory.
 cd "$at_dir"
@@ -1847,26 +1699,35 @@ at_stop_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: ending at: $at_stop_date" >&5
 case $at_start_time,$at_stop_time in
   [0-9]*,[0-9]*)
-    as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
-    as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
-    as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
-    as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
-    as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     $as_echo "$as_me: test suite duration: $at_duration" >&5
     ;;
 esac
 
 echo
-$as_echo "## ------------- ##
+cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
 echo
 {
   echo
-  $as_echo "## ------------- ##
+  cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1884,14 +1745,12 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
     at_result="$at_result $at_were run, one failed"
   fi
   at_result="$at_result unexpectedly and inhibited subsequent tests."
-  at_color=$at_red
 else
   # Don't you just love exponential explosion of the number of cases?
-  at_color=$at_red
   case $at_xpass_count:$at_fail_count:$at_xfail_count in
     # So far, so good.
-    0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
-    0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
+    0:0:0) at_result="$at_result $at_were successful." ;;
+    0:0:*) at_result="$at_result behaved as expected." ;;
 
     # Some unexpected failures
     0:*:0) at_result="$at_result $at_were run,
@@ -1937,16 +1796,18 @@ $at_skip_count tests were skipped." ;;
 esac
 
 if test $at_unexpected_count = 0; then
-  echo "$at_color$at_result$at_std"
+  echo "$at_result"
   echo "$at_result" >&5
 else
-  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&5
   {
     echo
-    $as_echo "## ------------------------ ##
+    cat <<\_ASBOX
+## ------------------------ ##
 ## Summary of the failures. ##
-## ------------------------ ##"
+## ------------------------ ##
+_ASBOX
 
     # Summary of failed and skipped tests.
     if test $at_fail_count != 0; then
@@ -1965,9 +1826,11 @@ else
       echo
     fi
     if test $at_fail_count != 0; then
-      $as_echo "## ---------------------- ##
+      cat <<\_ASBOX
+## ---------------------- ##
 ## Detailed failed tests. ##
-## ---------------------- ##"
+## ---------------------- ##
+_ASBOX
       echo
       for at_group in $at_fail_list
       do
@@ -1999,21 +1862,19 @@ _ASBOX
 _ASBOX
 
   echo
-  if $at_debug_p; then
-    at_msg='per-test log files'
-  else
-    at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
-  fi
-  $as_echo "Please send $at_msg and all information you think might help:
+  $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
 
    To: <opendap-tech at opendap.org>
-   Subject: [libdap 3.18.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point.  Its output may
-be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
+   Subject: [libdap 3.18.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 "
-  exit 1
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.  Its output may'
+    $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+    echo
+  fi
+    exit 1
 fi
 
 exit 0
@@ -2022,1762 +1883,2442 @@ exit 0
 ## Actual tests. ##
 ## ------------- ##
 #AT_START_1
-at_fn_group_banner 1 'DASTest.at:31' \
-  "DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das" ""
+# 1. DASTest.at:31: DAS $abs_srcdir/das-testsuite/bad_value_test.1.das
+at_setup_line='DASTest.at:31'
+at_desc="DAS \$abs_srcdir/das-testsuite/bad_value_test.1.das"
+$at_quiet $as_echo_n "  1: $at_desc"
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $as_echo "1. DASTest.at:31: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:31: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/bad_value_test.1.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true" "DASTest.at:31"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:31 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/bad_value_test.1.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:31: diff -b -B \$abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr" "DASTest.at:31"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:31 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/bad_value_test.1.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:31"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_1
 #AT_START_2
-at_fn_group_banner 2 'DASTest.at:32' \
-  "DAS \$abs_srcdir/das-testsuite/das.das" "          "
+# 2. DASTest.at:32: DAS $abs_srcdir/das-testsuite/das.das
+at_setup_line='DASTest.at:32'
+at_desc="DAS \$abs_srcdir/das-testsuite/das.das"
+$at_quiet $as_echo_n "  2: $at_desc          "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $as_echo "2. DASTest.at:32: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/das.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:32: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/das.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true" "DASTest.at:32"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:32 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/das.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:32: diff -b -B \$abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/das.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr" "DASTest.at:32"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:32 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/das.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/das.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:32"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_2
 #AT_START_3
-at_fn_group_banner 3 'DASTest.at:33' \
-  "DAS \$abs_srcdir/das-testsuite/special.test.das" " "
+# 3. DASTest.at:33: DAS $abs_srcdir/das-testsuite/special.test.das
+at_setup_line='DASTest.at:33'
+at_desc="DAS \$abs_srcdir/das-testsuite/special.test.das"
+$at_quiet $as_echo_n "  3: $at_desc "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $as_echo "3. DASTest.at:33: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/special.test.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:33: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/special.test.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true" "DASTest.at:33"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:33 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:33: diff -b -B \$abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/special.test.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr" "DASTest.at:33"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:33 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:33"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_3
 #AT_START_4
-at_fn_group_banner 4 'DASTest.at:34' \
-  "DAS \$abs_srcdir/das-testsuite/special.test.hdf.das" ""
+# 4. DASTest.at:34: DAS $abs_srcdir/das-testsuite/special.test.hdf.das
+at_setup_line='DASTest.at:34'
+at_desc="DAS \$abs_srcdir/das-testsuite/special.test.hdf.das"
+$at_quiet $as_echo_n "  4: $at_desc"
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $as_echo "4. DASTest.at:34: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:34: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/special.test.hdf.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true" "DASTest.at:34"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:34 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/special.test.hdf.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:34: diff -b -B \$abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/special.test.hdf.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr" "DASTest.at:34"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:34 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/special.test.hdf.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:34"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_4
 #AT_START_5
-at_fn_group_banner 5 'DASTest.at:35' \
-  "DAS \$abs_srcdir/das-testsuite/test.1.das" "       "
+# 5. DASTest.at:35: DAS $abs_srcdir/das-testsuite/test.1.das
+at_setup_line='DASTest.at:35'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.1.das"
+$at_quiet $as_echo_n "  5: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $as_echo "5. DASTest.at:35: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.1.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:35: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.1.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true" "DASTest.at:35"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:35 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:35: diff -b -B \$abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.1.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr" "DASTest.at:35"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:35 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:35"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_5
 #AT_START_6
-at_fn_group_banner 6 'DASTest.at:36' \
-  "DAS \$abs_srcdir/das-testsuite/test.11.das" "      "
+# 6. DASTest.at:36: DAS $abs_srcdir/das-testsuite/test.11.das
+at_setup_line='DASTest.at:36'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.11.das"
+$at_quiet $as_echo_n "  6: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $as_echo "6. DASTest.at:36: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.11.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:36: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.11.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true" "DASTest.at:36"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:36 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.11.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:36: diff -b -B \$abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.11.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr" "DASTest.at:36"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:36 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.11.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:36"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_6
 #AT_START_7
-at_fn_group_banner 7 'DASTest.at:37' \
-  "DAS \$abs_srcdir/das-testsuite/test.12.das" "      "
+# 7. DASTest.at:37: DAS $abs_srcdir/das-testsuite/test.12.das
+at_setup_line='DASTest.at:37'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.12.das"
+$at_quiet $as_echo_n "  7: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $as_echo "7. DASTest.at:37: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.12.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:37: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.12.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true" "DASTest.at:37"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:37 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.12.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:37: diff -b -B \$abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.12.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr" "DASTest.at:37"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:37 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.12.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:37"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_7
 #AT_START_8
-at_fn_group_banner 8 'DASTest.at:38' \
-  "DAS \$abs_srcdir/das-testsuite/test.13.das" "      "
+# 8. DASTest.at:38: DAS $abs_srcdir/das-testsuite/test.13.das
+at_setup_line='DASTest.at:38'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.13.das"
+$at_quiet $as_echo_n "  8: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $as_echo "8. DASTest.at:38: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.13.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:38: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.13.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true" "DASTest.at:38"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:38 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.13.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:38: diff -b -B \$abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.13.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr" "DASTest.at:38"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:38 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.13.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:38"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_8
 #AT_START_9
-at_fn_group_banner 9 'DASTest.at:39' \
-  "DAS \$abs_srcdir/das-testsuite/test.14.das" "      "
+# 9. DASTest.at:39: DAS $abs_srcdir/das-testsuite/test.14.das
+at_setup_line='DASTest.at:39'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.14.das"
+$at_quiet $as_echo_n "  9: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $as_echo "9. DASTest.at:39: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.14.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:39: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.14.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true" "DASTest.at:39"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:39 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.14.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:39: diff -b -B \$abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.14.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr" "DASTest.at:39"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:39 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.14.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:39"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_9
 #AT_START_10
-at_fn_group_banner 10 'DASTest.at:40' \
-  "DAS \$abs_srcdir/das-testsuite/test.15.das" "      "
+# 10. DASTest.at:40: DAS $abs_srcdir/das-testsuite/test.15.das
+at_setup_line='DASTest.at:40'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.15.das"
+$at_quiet $as_echo_n " 10: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $as_echo "10. DASTest.at:40: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.15.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:40: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.15.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true" "DASTest.at:40"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:40 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.15.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:40: diff -b -B \$abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.15.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr" "DASTest.at:40"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:40 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.15.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:40"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_10
 #AT_START_11
-at_fn_group_banner 11 'DASTest.at:41' \
-  "DAS \$abs_srcdir/das-testsuite/test.16.das" "      "
+# 11. DASTest.at:41: DAS $abs_srcdir/das-testsuite/test.16.das
+at_setup_line='DASTest.at:41'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.16.das"
+$at_quiet $as_echo_n " 11: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $as_echo "11. DASTest.at:41: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.16.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:41: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.16.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true" "DASTest.at:41"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:41 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.16.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:41: diff -b -B \$abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.16.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr" "DASTest.at:41"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:41 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.16.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:41"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_11
 #AT_START_12
-at_fn_group_banner 12 'DASTest.at:42' \
-  "DAS \$abs_srcdir/das-testsuite/test.17.das" "      "
+# 12. DASTest.at:42: DAS $abs_srcdir/das-testsuite/test.17.das
+at_setup_line='DASTest.at:42'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.17.das"
+$at_quiet $as_echo_n " 12: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $as_echo "12. DASTest.at:42: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.17.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:42: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.17.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true" "DASTest.at:42"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:42 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.17.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:42: diff -b -B \$abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.17.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr" "DASTest.at:42"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:42 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.17.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:42"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_12
 #AT_START_13
-at_fn_group_banner 13 'DASTest.at:43' \
-  "DAS \$abs_srcdir/das-testsuite/test.18.das" "      "
+# 13. DASTest.at:43: DAS $abs_srcdir/das-testsuite/test.18.das
+at_setup_line='DASTest.at:43'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.18.das"
+$at_quiet $as_echo_n " 13: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $as_echo "13. DASTest.at:43: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.18.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:43: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.18.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true" "DASTest.at:43"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:43 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.18.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:43: diff -b -B \$abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.18.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr" "DASTest.at:43"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:43 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.18.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:43"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_13
 #AT_START_14
-at_fn_group_banner 14 'DASTest.at:44' \
-  "DAS \$abs_srcdir/das-testsuite/test.19.das" "      "
+# 14. DASTest.at:44: DAS $abs_srcdir/das-testsuite/test.19.das
+at_setup_line='DASTest.at:44'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.19.das"
+$at_quiet $as_echo_n " 14: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $as_echo "14. DASTest.at:44: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.19.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:44: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.19.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true" "DASTest.at:44"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:44 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.19.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:44: diff -b -B \$abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.19.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr" "DASTest.at:44"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:44 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.19.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:44"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_14
 #AT_START_15
-at_fn_group_banner 15 'DASTest.at:45' \
-  "DAS \$abs_srcdir/das-testsuite/test.1a.das" "      "
+# 15. DASTest.at:45: DAS $abs_srcdir/das-testsuite/test.1a.das
+at_setup_line='DASTest.at:45'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.1a.das"
+$at_quiet $as_echo_n " 15: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $as_echo "15. DASTest.at:45: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:45: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.1a.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true" "DASTest.at:45"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:45 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.1a.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:45: diff -b -B \$abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.1a.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr" "DASTest.at:45"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:45 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.1a.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:45"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_15
 #AT_START_16
-at_fn_group_banner 16 'DASTest.at:46' \
-  "DAS \$abs_srcdir/das-testsuite/test.2.das" "       "
+# 16. DASTest.at:46: DAS $abs_srcdir/das-testsuite/test.2.das
+at_setup_line='DASTest.at:46'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.2.das"
+$at_quiet $as_echo_n " 16: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $as_echo "16. DASTest.at:46: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.2.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:46: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.2.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true" "DASTest.at:46"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:46 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.2.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:46: diff -b -B \$abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.2.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr" "DASTest.at:46"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:46 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.2.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:46"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_16
 #AT_START_17
-at_fn_group_banner 17 'DASTest.at:47' \
-  "DAS \$abs_srcdir/das-testsuite/test.20.das" "      "
+# 17. DASTest.at:47: DAS $abs_srcdir/das-testsuite/test.20.das
+at_setup_line='DASTest.at:47'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.20.das"
+$at_quiet $as_echo_n " 17: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $as_echo "17. DASTest.at:47: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.20.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:47: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.20.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true" "DASTest.at:47"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:47 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.20.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:47: diff -b -B \$abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.20.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr" "DASTest.at:47"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:47 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.20.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:47"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_17
 #AT_START_18
-at_fn_group_banner 18 'DASTest.at:48' \
-  "DAS \$abs_srcdir/das-testsuite/test.21.das" "      "
+# 18. DASTest.at:48: DAS $abs_srcdir/das-testsuite/test.21.das
+at_setup_line='DASTest.at:48'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.21.das"
+$at_quiet $as_echo_n " 18: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $as_echo "18. DASTest.at:48: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.21.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:48: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.21.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true" "DASTest.at:48"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.21.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:48: diff -b -B \$abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.21.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr" "DASTest.at:48"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.21.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_18
 #AT_START_19
-at_fn_group_banner 19 'DASTest.at:49' \
-  "DAS \$abs_srcdir/das-testsuite/test.22.das" "      "
+# 19. DASTest.at:49: DAS $abs_srcdir/das-testsuite/test.22.das
+at_setup_line='DASTest.at:49'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.22.das"
+$at_quiet $as_echo_n " 19: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $as_echo "19. DASTest.at:49: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.22.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:49: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.22.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true" "DASTest.at:49"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.22.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:49: diff -b -B \$abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.22.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr" "DASTest.at:49"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.22.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_19
 #AT_START_20
-at_fn_group_banner 20 'DASTest.at:50' \
-  "DAS \$abs_srcdir/das-testsuite/test.23.das" "      "
+# 20. DASTest.at:50: DAS $abs_srcdir/das-testsuite/test.23.das
+at_setup_line='DASTest.at:50'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.23.das"
+$at_quiet $as_echo_n " 20: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $as_echo "20. DASTest.at:50: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.23.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:50: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.23.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true" "DASTest.at:50"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.23.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:50: diff -b -B \$abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.23.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr" "DASTest.at:50"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.23.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_20
 #AT_START_21
-at_fn_group_banner 21 'DASTest.at:51' \
-  "DAS \$abs_srcdir/das-testsuite/test.24.das" "      "
+# 21. DASTest.at:51: DAS $abs_srcdir/das-testsuite/test.24.das
+at_setup_line='DASTest.at:51'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.24.das"
+$at_quiet $as_echo_n " 21: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $as_echo "21. DASTest.at:51: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.24.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:51: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.24.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true" "DASTest.at:51"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.24.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:51: diff -b -B \$abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.24.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr" "DASTest.at:51"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.24.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_21
 #AT_START_22
-at_fn_group_banner 22 'DASTest.at:52' \
-  "DAS \$abs_srcdir/das-testsuite/test.25.das" "      "
+# 22. DASTest.at:52: DAS $abs_srcdir/das-testsuite/test.25.das
+at_setup_line='DASTest.at:52'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.25.das"
+$at_quiet $as_echo_n " 22: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $as_echo "22. DASTest.at:52: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.25.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:52: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.25.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true" "DASTest.at:52"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.25.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:52: diff -b -B \$abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.25.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr" "DASTest.at:52"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.25.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_22
 #AT_START_23
-at_fn_group_banner 23 'DASTest.at:53' \
-  "DAS \$abs_srcdir/das-testsuite/test.26.das" "      "
+# 23. DASTest.at:53: DAS $abs_srcdir/das-testsuite/test.26.das
+at_setup_line='DASTest.at:53'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.26.das"
+$at_quiet $as_echo_n " 23: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $as_echo "23. DASTest.at:53: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.26.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:53: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.26.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true" "DASTest.at:53"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.26.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:53: diff -b -B \$abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.26.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr" "DASTest.at:53"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.26.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_23
 #AT_START_24
-at_fn_group_banner 24 'DASTest.at:54' \
-  "DAS \$abs_srcdir/das-testsuite/test.27.das" "      "
+# 24. DASTest.at:54: DAS $abs_srcdir/das-testsuite/test.27.das
+at_setup_line='DASTest.at:54'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.27.das"
+$at_quiet $as_echo_n " 24: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $as_echo "24. DASTest.at:54: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.27.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:54: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.27.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true" "DASTest.at:54"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.27.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:54: diff -b -B \$abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.27.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr" "DASTest.at:54"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.27.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_24
 #AT_START_25
-at_fn_group_banner 25 'DASTest.at:55' \
-  "DAS \$abs_srcdir/das-testsuite/test.28.das" "      "
+# 25. DASTest.at:55: DAS $abs_srcdir/das-testsuite/test.28.das
+at_setup_line='DASTest.at:55'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.28.das"
+$at_quiet $as_echo_n " 25: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $as_echo "25. DASTest.at:55: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.28.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:55: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.28.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true" "DASTest.at:55"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.28.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:55: diff -b -B \$abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.28.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr" "DASTest.at:55"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.28.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_25
 #AT_START_26
-at_fn_group_banner 26 'DASTest.at:56' \
-  "DAS \$abs_srcdir/das-testsuite/test.29.das" "      "
+# 26. DASTest.at:56: DAS $abs_srcdir/das-testsuite/test.29.das
+at_setup_line='DASTest.at:56'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.29.das"
+$at_quiet $as_echo_n " 26: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $as_echo "26. DASTest.at:56: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.29.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:56: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.29.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true" "DASTest.at:56"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.29.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:56: diff -b -B \$abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.29.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr" "DASTest.at:56"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.29.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_26
 #AT_START_27
-at_fn_group_banner 27 'DASTest.at:57' \
-  "DAS \$abs_srcdir/das-testsuite/test.3.das" "       "
+# 27. DASTest.at:57: DAS $abs_srcdir/das-testsuite/test.3.das
+at_setup_line='DASTest.at:57'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.3.das"
+$at_quiet $as_echo_n " 27: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $as_echo "27. DASTest.at:57: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.3.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:57: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.3.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true" "DASTest.at:57"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:57: diff -b -B \$abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.3.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr" "DASTest.at:57"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_27
 #AT_START_28
-at_fn_group_banner 28 'DASTest.at:58' \
-  "DAS \$abs_srcdir/das-testsuite/test.3.Z.das" "     "
+# 28. DASTest.at:58: DAS $abs_srcdir/das-testsuite/test.3.Z.das
+at_setup_line='DASTest.at:58'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.3.Z.das"
+$at_quiet $as_echo_n " 28: $at_desc     "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $as_echo "28. DASTest.at:58: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:58: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.3.Z.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true" "DASTest.at:58"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.3.Z.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:58: diff -b -B \$abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.3.Z.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr" "DASTest.at:58"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.3.Z.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_28
 #AT_START_29
-at_fn_group_banner 29 'DASTest.at:59' \
-  "DAS \$abs_srcdir/das-testsuite/test.30.das" "      "
+# 29. DASTest.at:59: DAS $abs_srcdir/das-testsuite/test.30.das
+at_setup_line='DASTest.at:59'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.30.das"
+$at_quiet $as_echo_n " 29: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $as_echo "29. DASTest.at:59: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.30.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:59: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.30.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true" "DASTest.at:59"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.30.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:59: diff -b -B \$abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.30.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr" "DASTest.at:59"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.30.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_29
 #AT_START_30
-at_fn_group_banner 30 'DASTest.at:60' \
-  "DAS \$abs_srcdir/das-testsuite/test.31.das" "      "
+# 30. DASTest.at:60: DAS $abs_srcdir/das-testsuite/test.31.das
+at_setup_line='DASTest.at:60'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.31.das"
+$at_quiet $as_echo_n " 30: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $as_echo "30. DASTest.at:60: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.31.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:60: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.31.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true" "DASTest.at:60"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.31.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:60: diff -b -B \$abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.31.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr" "DASTest.at:60"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.31.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_30
 #AT_START_31
-at_fn_group_banner 31 'DASTest.at:61' \
-  "DAS \$abs_srcdir/das-testsuite/test.32.das" "      "
+# 31. DASTest.at:61: DAS $abs_srcdir/das-testsuite/test.32.das
+at_setup_line='DASTest.at:61'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.32.das"
+$at_quiet $as_echo_n " 31: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $as_echo "31. DASTest.at:61: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.32.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:61: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.32.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true" "DASTest.at:61"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.32.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:61: diff -b -B \$abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.32.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr" "DASTest.at:61"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.32.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_31
 #AT_START_32
-at_fn_group_banner 32 'DASTest.at:62' \
-  "DAS \$abs_srcdir/das-testsuite/test.33.das" "      "
+# 32. DASTest.at:62: DAS $abs_srcdir/das-testsuite/test.33.das
+at_setup_line='DASTest.at:62'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.33.das"
+$at_quiet $as_echo_n " 32: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $as_echo "32. DASTest.at:62: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.33.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:62: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.33.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true" "DASTest.at:62"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.33.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:62: diff -b -B \$abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.33.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr" "DASTest.at:62"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.33.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_32
 #AT_START_33
-at_fn_group_banner 33 'DASTest.at:63' \
-  "DAS \$abs_srcdir/das-testsuite/test.34.das" "      "
+# 33. DASTest.at:63: DAS $abs_srcdir/das-testsuite/test.34.das
+at_setup_line='DASTest.at:63'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.34.das"
+$at_quiet $as_echo_n " 33: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $as_echo "33. DASTest.at:63: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.34.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:63: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.34.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true" "DASTest.at:63"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.34.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:63: diff -b -B \$abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.34.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr" "DASTest.at:63"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.34.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_33
 #AT_START_34
-at_fn_group_banner 34 'DASTest.at:64' \
-  "DAS \$abs_srcdir/das-testsuite/test.35.das" "      "
+# 34. DASTest.at:64: DAS $abs_srcdir/das-testsuite/test.35.das
+at_setup_line='DASTest.at:64'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.35.das"
+$at_quiet $as_echo_n " 34: $at_desc      "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $as_echo "34. DASTest.at:64: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.35.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:64: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.35.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true" "DASTest.at:64"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.35.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:64: diff -b -B \$abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.35.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr" "DASTest.at:64"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.35.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_34
 #AT_START_35
-at_fn_group_banner 35 'DASTest.at:65' \
-  "DAS \$abs_srcdir/das-testsuite/test.4.das" "       "
+# 35. DASTest.at:65: DAS $abs_srcdir/das-testsuite/test.4.das
+at_setup_line='DASTest.at:65'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.4.das"
+$at_quiet $as_echo_n " 35: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $as_echo "35. DASTest.at:65: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.4.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:65: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.4.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true" "DASTest.at:65"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.4.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:65: diff -b -B \$abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.4.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr" "DASTest.at:65"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.4.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_35
 #AT_START_36
-at_fn_group_banner 36 'DASTest.at:66' \
-  "DAS \$abs_srcdir/das-testsuite/test.5.das" "       "
+# 36. DASTest.at:66: DAS $abs_srcdir/das-testsuite/test.5.das
+at_setup_line='DASTest.at:66'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.5.das"
+$at_quiet $as_echo_n " 36: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $as_echo "36. DASTest.at:66: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.5.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:66: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.5.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true" "DASTest.at:66"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.5.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:66: diff -b -B \$abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.5.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr" "DASTest.at:66"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.5.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_36
 #AT_START_37
-at_fn_group_banner 37 'DASTest.at:67' \
-  "DAS \$abs_srcdir/das-testsuite/test.6.das" "       "
+# 37. DASTest.at:67: DAS $abs_srcdir/das-testsuite/test.6.das
+at_setup_line='DASTest.at:67'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.6.das"
+$at_quiet $as_echo_n " 37: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $as_echo "37. DASTest.at:67: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.6.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:67: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.6.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true" "DASTest.at:67"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.6.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:67: diff -b -B \$abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.6.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr" "DASTest.at:67"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.6.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_37
 #AT_START_38
-at_fn_group_banner 38 'DASTest.at:68' \
-  "DAS \$abs_srcdir/das-testsuite/test.7.das" "       "
+# 38. DASTest.at:68: DAS $abs_srcdir/das-testsuite/test.7.das
+at_setup_line='DASTest.at:68'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.7.das"
+$at_quiet $as_echo_n " 38: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $as_echo "38. DASTest.at:68: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.7.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:68: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.7.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true" "DASTest.at:68"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.7.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:68: diff -b -B \$abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.7.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr" "DASTest.at:68"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.7.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_38
 #AT_START_39
-at_fn_group_banner 39 'DASTest.at:69' \
-  "DAS \$abs_srcdir/das-testsuite/test.8.das" "       "
+# 39. DASTest.at:69: DAS $abs_srcdir/das-testsuite/test.8.das
+at_setup_line='DASTest.at:69'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.8.das"
+$at_quiet $as_echo_n " 39: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $as_echo "39. DASTest.at:69: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.8.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:69: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.8.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true" "DASTest.at:69"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.8.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:69: diff -b -B \$abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.8.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr" "DASTest.at:69"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.8.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_39
 #AT_START_40
-at_fn_group_banner 40 'DASTest.at:70' \
-  "DAS \$abs_srcdir/das-testsuite/test.9.das" "       "
+# 40. DASTest.at:70: DAS $abs_srcdir/das-testsuite/test.9.das
+at_setup_line='DASTest.at:70'
+at_desc="DAS \$abs_srcdir/das-testsuite/test.9.das"
+$at_quiet $as_echo_n " 40: $at_desc       "
 at_xfail=no
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $as_echo "40. DASTest.at:70: testing ..."
   $at_traceon
 
 
 #Added || true because the $abs_srcdir/das-test -p < $abs_srcdir/das-testsuite/test.9.das needs to be true whether the
 #output is printed to stdout or stderr
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:70: \$abs_builddir/das-test -p < \$abs_srcdir/das-testsuite/test.9.das || true"
-at_fn_check_prepare_dynamic "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true" "DASTest.at:70"
-( $at_check_trace; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DASTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true"; then
+  ( $at_traceon; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/das-test -p < $abs_srcdir/das-testsuite/test.9.das || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 #Need to compare either stdout or stderr because of the directory the above
 #AT_CHECK prints output to
-{ set +x
+{ $at_traceoff
 $as_echo "$at_srcdir/DASTest.at:70: diff -b -B \$abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B \$abs_srcdir/das-testsuite/test.9.das.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr" "DASTest.at:70"
-( $at_check_trace; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DASTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stdout || diff -b -B $abs_srcdir/das-testsuite/test.9.das.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DASTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-  set +x
+  $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_40
diff --git a/tests/DDSTest b/tests/DDSTest
index c146423..73e66f9 100755
--- a/tests/DDSTest
+++ b/tests/DDSTest
@@ -1,17 +1,17 @@
 #! /bin/sh
-# Generated from DDSTest.at by GNU Autoconf 2.69.
-#
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Generated from DDSTest.at by GNU Autoconf 2.63.
 #
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,15 +19,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -35,13 +43,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -52,7 +54,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -75,6 +77,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -84,16 +93,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -105,16 +113,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -126,319 +130,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+if as_func_success; then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+if as_func_ret_success; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
+
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
+fi
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-} # as_fn_mkdir_p
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
+if as_func_ret_success; then
+  :
 else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
 
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -455,12 +470,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -469,18 +482,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -495,29 +519,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -547,11 +591,6 @@ at_errexit_p=false
 # Shall we be verbose?  ':' means no, empty means yes.
 at_verbose=:
 at_quiet=
-# Running several jobs in parallel, 0 means as many as test groups.
-at_jobs=1
-at_traceon=:
-at_trace_echo=:
-at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -566,8 +605,6 @@ at_list_p=false
 at_clean=false
 # Test groups to run
 at_groups=
-# Whether to rerun failed tests.
-at_recheck=
 # Whether a write failure occurred
 at_write_fail=0
 
@@ -581,10 +618,10 @@ esac
 # Whether -C is in effect.
 at_change_dir=false
 
-# Whether to enable colored test results.
-at_color=no
 # List of the tested programs.
 at_tested=''
+# List of the all the test groups.
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -626,14 +663,12 @@ at_help_all="1;DDSTest.at:48;DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked
 34;DDSTest.at:86;DDS \$abs_srcdir/dds-testsuite/test.25.dds;dds;
 35;DDSTest.at:87;DDS \$abs_srcdir/dds-testsuite/test.26.dds;dds;
 "
-# List of the all the test groups.
-at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
 
-# at_fn_validate_ranges NAME...
-# -----------------------------
-# Validate and normalize the test group number contained in each variable
-# NAME. Leading zeroes are treated as decimal.
-at_fn_validate_ranges ()
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME.  Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
 {
   for at_grp
   do
@@ -644,7 +679,7 @@ at_fn_validate_ranges ()
     fi
     case $at_value in
       0*) # We want to treat leading 0 as decimal, like expr and test, but
-	  # AS_VAR_ARITH treats it as octal if it uses $(( )).
+	  # at_func_arith treats it as octal if it uses $(( )).
 	  # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
 	  # expr fork, but it is not worth the effort to determine if the
 	  # shell supports XSI when the user can just avoid leading 0.
@@ -670,8 +705,8 @@ do
   fi
 
   case $at_option in
-  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
-  *)    at_optarg= ;;
+  *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
+  *)   at_optarg= ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -693,19 +728,6 @@ do
 	at_clean=:
 	;;
 
-    --color )
-	at_color=always
-	;;
-    --color=* )
-	case $at_optarg in
-	no | never | none) at_color=never ;;
-	auto | tty | if-tty) at_color=auto ;;
-	always | yes | force) at_color=always ;;
-	*) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
-	   as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
-	esac
-	;;
-
     --debug | -d )
 	at_debug_p=:
 	;;
@@ -720,31 +742,29 @@ do
 	;;
 
     --trace | -x )
-	at_traceon='set -x'
-	at_trace_echo=echo
-	at_check_filter_trace=at_fn_filter_trace
+	at_traceon='set -x'; at_traceoff='set +x'
 	;;
 
     [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
-	at_fn_validate_ranges at_option
-	as_fn_append at_groups "$at_option$as_nl"
+	at_func_validate_ranges at_option
+	at_groups="$at_groups$at_option "
 	;;
 
     # Ranges
     [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
 	at_range_start=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_start
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,$p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.* \('$at_range_start' \)/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
 	at_range_end=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '1,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -760,10 +780,11 @@ do
 	  at_range_end=$at_range_start
 	  at_range_start=$at_tmp
 	fi
-	at_fn_validate_ranges at_range_start at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.*\( '$at_range_start' \)/\1/' \
+	      -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     # Directory selection.
@@ -773,25 +794,6 @@ do
     --directory=* )
 	at_change_dir=:
 	at_dir=$at_optarg
-	if test x- = "x$at_dir" ; then
-	  at_dir=./-
-	fi
-	;;
-
-    # Parallel execution.
-    --jobs | -j )
-	at_jobs=0
-	;;
-    --jobs=* | -j[0-9]* )
-	if test -n "$at_optarg"; then
-	  at_jobs=$at_optarg
-	else
-	  at_jobs=`expr X$at_option : 'X-j\(.*\)'`
-	fi
-	case $at_jobs in *[!0-9]*)
-	  at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
-	  as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
-	esac
 	;;
 
     # Keywords.
@@ -818,12 +820,11 @@ do
 	  at_groups_selected=`$as_echo "$at_groups_selected" |
 	      grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
 	done
-	# Smash the keywords.
-	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-	as_fn_append at_groups "$at_groups_selected$as_nl"
-	;;
-    --recheck)
-	at_recheck=:
+	# Smash the newlines.
+	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+	  tr "$as_nl" ' '
+	`
+	at_groups="$at_groups$at_groups_selected "
 	;;
     --baselines )
 	at_prev=--baselines
@@ -841,12 +842,14 @@ do
 	# Reject names that are not valid shell variable names.
 	case $at_envvar in
 	  '' | [0-9]* | *[!_$as_cr_alnum]* )
-	    as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
+	    { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+   { (exit 1); exit 1; }; } ;;
 	esac
 	at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
 	# Export now, but save eval for later and for debug scripts.
 	export $at_envvar
-	as_fn_append at_debug_args " $at_envvar='$at_value'"
+	at_debug_args="$at_debug_args $at_envvar='$at_value'"
 	;;
 
      *) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -857,54 +860,32 @@ do
 done
 
 # Verify our last option didn't require an argument
-if test -n "$at_prev"; then :
-  as_fn_error $? "\`$at_prev' requires an argument"
+if test -n "$at_prev"; then
+  { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
 
 # Selected test groups.
-if test -z "$at_groups$at_recheck"; then
+if test -z "$at_groups"; then
   at_groups=$at_groups_all
 else
-  if test -n "$at_recheck" && test -r "$at_suite_log"; then
-    at_oldfails=`sed -n '
-      /^Failed tests:$/,/^Skipped tests:$/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^Unexpected passes:$/,/^## Detailed failed tests/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^## Detailed failed tests/q
-      ' "$at_suite_log"`
-    as_fn_append at_groups "$at_oldfails$as_nl"
-  fi
   # Sort the tests, removing duplicates.
-  at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
-fi
-
-if test x"$at_color" = xalways \
-   || { test x"$at_color" = xauto && test -t 1; }; then
-  at_red=`printf '\033[0;31m'`
-  at_grn=`printf '\033[0;32m'`
-  at_lgn=`printf '\033[1;32m'`
-  at_blu=`printf '\033[1;34m'`
-  at_std=`printf '\033[m'`
-else
-  at_red= at_grn= at_lgn= at_blu= at_std=
+  at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
 fi
 
 ##
 ## Process package specific options when _not_ supplied.
 ##
 
-if $at_arg_given_baselines; then :
-
+if $at_arg_given_baselines; then
+  :
 else
   baselines=
 fi
 
+
 # Help message.
 if $at_help_p; then
   cat <<_ATEOF || at_write_fail=1
@@ -913,17 +894,16 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
 Run all the tests, or the selected TESTS, given by numeric ranges, and
 save a detailed log file.  Upon failure, create debugging scripts.
 
-Do not change environment variables directly.  Instead, set them via
-command line arguments.  Set \`AUTOTEST_PATH' to select the executables
+You should not change environment variables unless explicitly passed
+as command line arguments.  Set \`AUTOTEST_PATH' to select the executables
 to exercise.  Each relative directory is expanded as build and source
-directories relative to the top level of this distribution.
-E.g., from within the build directory /tmp/foo-1.0, invoking this:
+directories relatively to the top level of this distribution.  E.g.,
 
   $ $0 AUTOTEST_PATH=bin
 
-is equivalent to the following, assuming the source directory is /src/foo-1.0:
+possibly amounts into
 
-  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
 _ATEOF
 cat <<_ATEOF || at_write_fail=1
 
@@ -938,14 +918,9 @@ cat <<_ATEOF || at_write_fail=1
 Execution tuning:
   -C, --directory=DIR
                  change to directory DIR before starting
-      --color[=never|auto|always]
-                 enable colored test results on terminal, or always
-  -j, --jobs[=N]
-                 Allow N jobs at once; infinite jobs with no arg (default 1)
   -k, --keywords=KEYWORDS
                  select the tests matching all the comma-separated KEYWORDS
                  multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-      --recheck  select all tests that failed or passed unexpectedly last time
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
                  default for debugging scripts
@@ -971,69 +946,64 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-libdap 3.18.1 test suite: dds-test test groups:
+libdap 3.18.2 test suite: dds-test test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
-  # Pass an empty line as separator between selected groups and help.
-  $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-    awk 'NF == 1 && FS != ";" {
-	   selected[$ 1] = 1
+  # Passing at_groups is tricky.  We cannot use it to form a literal string
+  # or regexp because of the limitation of AIX awk.  And Solaris' awk
+  # doesn't grok more than 99 fields in a record, so we have to use `split'.
+  # at_groups needs to be space-separated for this script to work.
+  case $at_groups in
+    *"$as_nl"* )
+      at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+  esac
+  $as_echo "$at_groups$as_nl$at_help_all" |
+    awk 'BEGIN { FS = ";" }
+	 NR == 1 {
+	   for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
 	   next
 	 }
-	 /^$/ { FS = ";" }
-	 NF > 0 {
+	 {
 	   if (selected[$ 1]) {
 	     printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-	     if ($ 4) {
-	       lmax = 79
-	       indent = "     "
-	       line = indent
-	       len = length (line)
-	       n = split ($ 4, a, " ")
-	       for (i = 1; i <= n; i++) {
-		 l = length (a[i]) + 1
-		 if (i > 1 && len + l > lmax) {
-		   print line
-		   line = indent " " a[i]
-		   len = length (line)
-		 } else {
-		   line = line " " a[i]
-		   len += l
-		 }
-	       }
-	       if (n)
-		 print line
-	     }
+	     if ($ 4) printf "      %s\n", $ 4
 	   }
 	 }' || at_write_fail=1
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (libdap 3.18.1)" &&
-  cat <<\_ATEOF || at_write_fail=1
+  $as_echo "$as_me (libdap 3.18.2)" &&
+  cat <<\_ACEOF || at_write_fail=1
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
-_ATEOF
+_ACEOF
   exit $at_write_fail
 fi
 
-# Should we print banners?  Yes if more than one test is run.
-case $at_groups in #(
-  *$as_nl* )
-      at_print_banners=: ;; #(
+# Should we print banners?  at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+  *' '*' '* | *"$as_nl"*"$as_nl"* )
+      at_print_banners=: ;;
   * ) at_print_banners=false ;;
 esac
-# Text for banner N, set to a single space once printed.
+# Text for banner N, set to empty once printed.
 
 # Take any -C into account.
 if $at_change_dir ; then
+  if test x- = "x$at_dir" ; then
+    at_dir=./-
+  fi
   test x != "x$at_dir" && cd "$at_dir" \
-    || as_fn_error $? "unable to change directory"
+    || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+   { (exit 1); exit 1; }; }
   at_dir=`pwd`
 fi
 
@@ -1041,11 +1011,13 @@ fi
 for at_file in atconfig atlocal
 do
   test -r $at_file || continue
-  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+  . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+   { (exit 1); exit 1; }; }
 done
 
 # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: "${at_top_build_prefix=$at_top_builddir}"
+: ${at_top_build_prefix=$at_top_builddir}
 
 # Perform any assignments requested during argument parsing.
 eval "$at_debug_args"
@@ -1056,7 +1028,8 @@ if test -n "$at_top_srcdir"; then
   builddir=../..
   for at_dir_var in srcdir top_srcdir top_build_prefix
   do
-    eval at_val=\$at_$at_dir_var
+    at_val=`eval 'as_val=${'at_$at_dir_var'}
+		 $as_echo "$as_val"'`
     case $at_val in
       [\\/$]* | ?:[\\/]* ) at_prefix= ;;
       *) at_prefix=../../ ;;
@@ -1065,9 +1038,9 @@ if test -n "$at_top_srcdir"; then
   done
 fi
 
-## -------------------- ##
-## Directory structure. ##
-## -------------------- ##
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
 
 # This is the set of directories and files used by this script
 # (non-literals are capitalized):
@@ -1098,14 +1071,12 @@ fi
 # The directory the whole suite works in.
 # Should be absolute to let the user `cd' at will.
 at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite ($at_dir might have changed since earlier).
+# The file containing the suite.
 at_suite_log=$at_dir/$as_me.log
 # The directory containing helper files per test group.
 at_helper_dir=$at_suite_dir/at-groups
 # Stop file: if it exists, do not start new jobs.
 at_stop_file=$at_suite_dir/at-stop
-# The fifo used for the job dispatcher.
-at_job_fifo=$at_suite_dir/at-job-fifo
 
 if $at_clean; then
   test -d "$at_suite_dir" &&
@@ -1129,23 +1100,23 @@ for as_dir in $AUTOTEST_PATH $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
+  test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
 case $as_dir in
   [\\/]* | ?:[\\/]* )
-    as_fn_append at_path "$as_dir"
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_build_prefix"; then
       # Stand-alone test suite.
-      as_fn_append at_path "$as_dir"
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
-      as_fn_append at_path "$at_top_srcdir/$as_dir"
+      at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 
@@ -1159,7 +1130,7 @@ for as_dir in $at_path
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -d "$as_dir" || continue
+  test -d "$as_dir" || continue
 case $as_dir in
   [\\/]* | ?:[\\/]* ) ;;
   * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1167,18 +1138,15 @@ esac
 case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
   *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
   $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
-  *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
+  *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-
-
-
 # 5 is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
@@ -1188,28 +1156,43 @@ fi
 exec 5>>"$at_suite_log"
 
 # Banners and logs.
-$as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: dds-test. ##
-## ----------------------------------- ##"
+cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: dds-test. ##
+## ----------------------------------- ##
+_ASBOX
 {
-  $as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: dds-test. ##
-## ----------------------------------- ##"
+  cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: dds-test. ##
+## ----------------------------------- ##
+_ASBOX
   echo
 
   $as_echo "$as_me: command line was:"
   $as_echo "  \$ $0 $at_cli_args"
   echo
 
-  # If ChangeLog exists, list a few lines in case it might help determining
-  # the exact version.
-  if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
-    $as_echo "## ---------- ##
-## ChangeLog. ##
-## ---------- ##"
-    echo
-    sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
+  # Try to find a few ChangeLogs in case it might help determining the
+  # exact version.  Use the relative dir: if the top dir is a symlink,
+  # find will not follow it (and options to follow the links are not
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
+  if test -n "$at_top_srcdir"; then
+    cat <<\_ASBOX
+## ----------- ##
+## ChangeLogs. ##
+## ----------- ##
+_ASBOX
     echo
+    for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
+    do
+      $as_echo "$as_me: $at_file:"
+      sed 's/^/| /;10q' $at_file
+      echo
+    done
+
   fi
 
   {
@@ -1242,8 +1225,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 }
@@ -1260,80 +1243,53 @@ IFS=$as_save_IFS
 } >&5
 
 
-## ------------------------- ##
-## Autotest shell functions. ##
-## ------------------------- ##
+## --------------- ##
+## Shell functions ##
+## --------------- ##
 
-# at_fn_banner NUMBER
-# -------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups and
-# this particular banner has not yet been printed.
-at_fn_banner ()
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
 {
   $at_print_banners || return 0
   eval at_banner_text=\$at_banner_text_$1
-  test "x$at_banner_text" = "x " && return 0
-  eval "at_banner_text_$1=\" \""
-  if test -z "$at_banner_text"; then
-    $at_first || echo
-  else
-    $as_echo "$as_nl$at_banner_text$as_nl"
-  fi
-} # at_fn_banner
-
-# at_fn_check_prepare_notrace REASON LINE
-# ---------------------------------------
-# Perform AT_CHECK preparations for the command at LINE for an untraceable
-# command; REASON is the reason for disabling tracing.
-at_fn_check_prepare_notrace ()
-{
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
-  $as_echo "$2" >"$at_check_line_file"
-  at_check_trace=: at_check_filter=:
-  : >"$at_stdout"; : >"$at_stderr"
-}
-
-# at_fn_check_prepare_trace LINE
-# ------------------------------
-# Perform AT_CHECK preparations for the command at LINE for a traceable
-# command.
-at_fn_check_prepare_trace ()
-{
-  $as_echo "$1" >"$at_check_line_file"
-  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
-  : >"$at_stdout"; : >"$at_stderr"
-}
+  test "x$at_banner_text" = x && return 0
+  eval at_banner_text_$1=
+  $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
 
-# at_fn_check_prepare_dynamic COMMAND LINE
-# ----------------------------------------
-# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
-# preparation function.
-at_fn_check_prepare_dynamic ()
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
 {
-  case $1 in
-    *$as_nl*)
-      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
-    *)
-      at_fn_check_prepare_trace "$2" ;;
+  case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+    return 1 ;;
+ *) return 0 ;;
   esac
 }
 
-# at_fn_filter_trace
-# ------------------
-# Remove the lines in the file "$at_stderr" generated by "set -x" and print
-# them to stderr.
-at_fn_filter_trace ()
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr").  Return the exit code EXIT-CODE.
+at_func_filter_trace ()
 {
-  mv "$at_stderr" "$at_stder1"
   grep '^ *+' "$at_stder1" >&2
   grep -v '^ *+' "$at_stder1" >"$at_stderr"
+  return $1
 }
 
-# at_fn_log_failure FILE-LIST
-# ---------------------------
+# at_func_log_failure FILE-LIST
+# -----------------------------
 # Copy the files in the list on stdout with a "> " prefix, and exit the shell
 # with a failure exit code.
-at_fn_log_failure ()
+at_func_log_failure ()
 {
   for file
     do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1341,62 +1297,56 @@ at_fn_log_failure ()
   exit 1
 }
 
-# at_fn_check_skip EXIT-CODE LINE
-# -------------------------------
-# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
-# the test group subshell with that same exit code. Use LINE in any report
-# about test failure.
-at_fn_check_skip ()
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
 {
   case $1 in
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$2: hard failure"; exit 99;;
     77) echo 77 > "$at_status_file"; exit 77;;
   esac
 }
 
-# at_fn_check_status EXPECTED EXIT-CODE LINE
-# ------------------------------------------
-# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
-# Otherwise, if it is 77 or 99, exit the test group subshell with that same
-# exit code; if it is anything else print an error message referring to LINE,
-# and fail the test.
-at_fn_check_status ()
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
 {
   case $2 in
     $1 ) ;;
     77) echo 77 > "$at_status_file"; exit 77;;
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$3: hard failure"; exit 99;;
     *) $as_echo "$3: exit code was $2, expected $1"
       at_failed=:;;
   esac
 }
 
-# at_fn_diff_devnull FILE
-# -----------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
-# invocations.
-at_fn_diff_devnull ()
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE.  Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
 {
   test -s "$1" || return 0
   $at_diff "$at_devnull" "$1"
 }
 
-# at_fn_test NUMBER
-# -----------------
+# at_func_test NUMBER
+# -------------------
 # Parse out test NUMBER from the tail of this file.
-at_fn_test ()
+at_func_test ()
 {
   eval at_sed=\$at_sed$1
   sed "$at_sed" "$at_myself" > "$at_test_source"
 }
 
-# at_fn_create_debugging_script
-# -----------------------------
+# at_func_create_debugging_script
+# -------------------------------
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
-at_fn_create_debugging_script ()
+at_func_create_debugging_script ()
 {
   {
     echo "#! /bin/sh" &&
@@ -1408,13 +1358,34 @@ at_fn_create_debugging_script ()
   chmod +x "$at_group_dir/run"
 }
 
-## -------------------------------- ##
-## End of autotest shell functions. ##
-## -------------------------------- ##
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.  The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  # With "$@", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $* ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "$@"`
+  }
+fi
+
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
 {
-  $as_echo "## ---------------- ##
+  cat <<\_ASBOX
+## ---------------- ##
 ## Tested programs. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1422,35 +1393,34 @@ at_fn_create_debugging_script ()
 for at_program in : $at_tested
 do
   test "$at_program" = : && continue
-  case $at_program in
-    [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
-    * )
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -f "$as_dir/$at_program" && break
-  done
+  test -f "$as_dir/$at_program" && break
+done
 IFS=$as_save_IFS
 
-    at_program_=$as_dir/$at_program ;;
-  esac
-  if test -f "$at_program_"; then
+  if test -f "$as_dir/$at_program"; then
     {
-      $as_echo "$at_srcdir/DDSTest.at:3: $at_program_ --version"
-      "$at_program_" --version </dev/null
+      $as_echo "$at_srcdir/DDSTest.at:3: $as_dir/$at_program --version"
+      "$as_dir/$at_program" --version </dev/null
       echo
     } >&5 2>&1
   else
-    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 done
 
 {
-  $as_echo "## ------------------ ##
+  cat <<\_ASBOX
+## ------------------ ##
 ## Running the tests. ##
-## ------------------ ##"
+## ------------------ ##
+_ASBOX
 } >&5
 
 at_start_date=`date`
@@ -1458,8 +1428,11 @@ at_start_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: starting at: $at_start_date" >&5
 
 # Create the master directory if it doesn't already exist.
-as_dir="$at_suite_dir"; as_fn_mkdir_p ||
-  as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
+test -d "$at_suite_dir" ||
+  mkdir "$at_suite_dir" ||
+  { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
 if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1493,40 +1466,28 @@ BEGIN { FS="" }
   if (test == "'"$at_group"'") exit
 }' "$at_myself" > "$at_suite_dir/at-source-lines" &&
 . "$at_suite_dir/at-source-lines" ||
-  as_fn_error $? "cannot create test line number cache" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+   { (exit 1); exit 1; }; }
 rm -f "$at_suite_dir/at-source-lines"
 
-# Set number of jobs for `-j'; avoid more jobs than test groups.
-set X $at_groups; shift; at_max_jobs=$#
-if test $at_max_jobs -eq 0; then
-  at_jobs=1
-fi
-if test $at_jobs -ne 1 &&
-   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
-  at_jobs=$at_max_jobs
-fi
-
-# If parallel mode, don't output banners, don't split summary lines.
-if test $at_jobs -ne 1; then
-  at_print_banners=false
-  at_quiet=:
-fi
-
 # Set up helper dirs.
 rm -rf "$at_helper_dir" &&
 mkdir "$at_helper_dir" &&
 cd "$at_helper_dir" &&
 { test -z "$at_groups" || mkdir $at_groups; } ||
-as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Functions for running a test group.  We leave the actual
 # test group execution outside of a shell function in order
 # to avoid hitting zsh 4.x exit status bugs.
 
-# at_fn_group_prepare
-# -------------------
-# Prepare for running a test group.
-at_fn_group_prepare ()
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
 {
   # The directory for additional per-group helper files.
   at_job_dir=$at_helper_dir/$at_group
@@ -1560,20 +1521,56 @@ at_fn_group_prepare ()
 
 
   # Create a fresh directory for the next test group, and enter.
-  # If one already exists, the user may have invoked ./run from
-  # within that directory; we remove the contents, but not the
-  # directory itself, so that we aren't pulling the rug out from
-  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
-  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
-  rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
-fi ||
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+    find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+    rm -fr "$at_group_dir" ||
+    { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+  fi
   # Be tolerant if the above `rm' was not able to remove the directory.
-  as_dir="$at_group_dir"; as_fn_mkdir_p
+  { as_dir="$at_group_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
   echo 0 > "$at_status_file"
 
@@ -1586,29 +1583,9 @@ $as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be
   fi
 }
 
-# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
-# -------------------------------------------------
-# Declare the test group ORDINAL, located at LINE with group description DESC,
-# and residing under BANNER. Use PAD to align the status column.
-at_fn_group_banner ()
-{
-  at_setup_line="$2"
-  test -n "$5" && at_fn_banner $5
-  at_desc="$3"
-  case $1 in
-    [0-9])      at_desc_line="  $1: ";;
-    [0-9][0-9]) at_desc_line=" $1: " ;;
-    *)          at_desc_line="$1: "  ;;
-  esac
-  as_fn_append at_desc_line "$3$4"
-  $at_quiet $as_echo_n "$at_desc_line"
-  echo "#                             -*- compilation -*-" >> "$at_group_log"
-}
-
-# at_fn_group_postprocess
-# -----------------------
-# Perform cleanup after running a test group.
-at_fn_group_postprocess ()
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
 {
   # Be sure to come back to the suite directory, in particular
   # since below we might `rm' the group directory we are in currently.
@@ -1621,7 +1598,6 @@ at_fn_group_postprocess ()
       report this failure to <opendap-tech at opendap.org>.
 _ATEOF
     $as_echo "$at_setup_line" >"$at_check_line_file"
-    at_status=99
   fi
   $at_verbose $as_echo_n "$at_group. $at_setup_line: "
   $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1630,41 +1606,31 @@ _ATEOF
 	at_msg="UNEXPECTED PASS"
 	at_res=xpass
 	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     no:0)
 	at_msg="ok"
 	at_res=pass
 	at_errexit=false
-	at_color=$at_grn
 	;;
     *:77)
 	at_msg='skipped ('`cat "$at_check_line_file"`')'
 	at_res=skip
 	at_errexit=false
-	at_color=$at_blu
-	;;
-    no:* | *:99)
-	at_msg='FAILED ('`cat "$at_check_line_file"`')'
-	at_res=fail
-	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     yes:*)
 	at_msg='expected failure ('`cat "$at_check_line_file"`')'
 	at_res=xfail
 	at_errexit=false
-	at_color=$at_lgn
+	;;
+    no:*)
+	at_msg='FAILED ('`cat "$at_check_line_file"`')'
+	at_res=fail
+	at_errexit=$at_errexit_p
 	;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
-  # In parallel mode, output the summary line only afterwards.
-  if test $at_jobs -ne 1 && test -n "$at_verbose"; then
-    $as_echo "$at_desc_line $at_color$at_msg$at_std"
-  else
-    # Make sure there is a separator even with long titles.
-    $as_echo " $at_color$at_msg$at_std"
-  fi
+  # Make sure there is a separator even with long titles.
+  $as_echo " $at_msg"
   at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
   case $at_status in
     0|77)
@@ -1679,13 +1645,9 @@ _ATEOF
       $as_echo "$at_log_msg" >> "$at_group_log"
       $as_echo "$at_log_msg" >&5
 
-      # Cleanup the group directory, unless the user wants the files
-      # or the success was unexpected.
-      if $at_debug_p || test $at_res = xpass; then
-	at_fn_create_debugging_script
-	if test $at_res = xpass && $at_errexit; then
-	  echo stop > "$at_stop_file"
-	fi
+      # Cleanup the group directory, unless the user wants the files.
+      if $at_debug_p; then
+	at_func_create_debugging_script
       else
 	if test -d "$at_group_dir"; then
 	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1702,7 +1664,7 @@ _ATEOF
 
       # Upon failure, keep the group directory for autopsy, and create
       # the debugging script.  With -e, do not start any further tests.
-      at_fn_create_debugging_script
+      at_func_create_debugging_script
       if $at_errexit; then
 	echo stop > "$at_stop_file"
       fi
@@ -1715,134 +1677,22 @@ _ATEOF
 ## Driver loop. ##
 ## ------------ ##
 
-
-if (set -m && set +m && set +b) >/dev/null 2>&1; then
-  set +b
-  at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
-else
-  at_job_control_on=: at_job_control_off=: at_job_group=
-fi
-
-for at_signal in 1 2 15; do
-  trap 'set +x; set +e
-	$at_job_control_off
-	at_signal='"$at_signal"'
-	echo stop > "$at_stop_file"
-	trap "" $at_signal
-	at_pgids=
-	for at_pgid in `jobs -p 2>/dev/null`; do
-	  at_pgids="$at_pgids $at_job_group$at_pgid"
-	done
-	test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
-	wait
-	if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
-	  echo >&2
-	fi
-	at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
-	set x $at_signame
-	test 1 -gt 2 && at_signame=$at_signal
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
-$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
-	as_fn_arith 128 + $at_signal && exit_status=$as_val
-	as_fn_exit $exit_status' $at_signal
-done
-
 rm -f "$at_stop_file"
 at_first=:
 
-if test $at_jobs -ne 1 &&
-     rm -f "$at_job_fifo" &&
-     test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
-then
-  # FIFO job dispatcher.
-
-  trap 'at_pids=
-	for at_pid in `jobs -p`; do
-	  at_pids="$at_pids $at_job_group$at_pid"
-	done
-	if test -n "$at_pids"; then
-	  at_sig=TSTP
-	  test "${TMOUT+set}" = set && at_sig=STOP
-	  kill -$at_sig $at_pids 2>/dev/null
-	fi
-	kill -STOP $$
-	test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
-
-  echo
-  # Turn jobs into a list of numbers, starting from 1.
-  at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
-  set X $at_joblist
-  shift
-  for at_group in $at_groups; do
-    $at_job_control_on 2>/dev/null
-    (
-      # Start one test group.
-      $at_job_control_off
-      if $at_first; then
-	exec 7>"$at_job_fifo"
-      else
-	exec 6<&-
-      fi
-      trap 'set +x; set +e
-	    trap "" PIPE
-	    echo stop > "$at_stop_file"
-	    echo >&7
-	    as_fn_exit 141' PIPE
-      at_fn_group_prepare
-      if cd "$at_group_dir" &&
-	 at_fn_test $at_group &&
-	 . "$at_test_source"
-      then :; else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+for at_group in $at_groups; do
+  at_func_group_prepare
+  if cd "$at_group_dir" &&
+     at_func_test $at_group &&
+     . "$at_test_source"; then :; else
+    { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
 $as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-	at_failed=:
-      fi
-      at_fn_group_postprocess
-      echo >&7
-    ) &
-    $at_job_control_off
-    if $at_first; then
-      at_first=false
-      exec 6<"$at_job_fifo" 7>"$at_job_fifo"
-    fi
-    shift # Consume one token.
-    if test $# -gt 0; then :; else
-      read at_token <&6 || break
-      set x $*
-    fi
-    test -f "$at_stop_file" && break
-  done
-  exec 7>&-
-  # Read back the remaining ($at_jobs - 1) tokens.
-  set X $at_joblist
-  shift
-  if test $# -gt 0; then
-    shift
-    for at_job
-    do
-      read at_token
-    done <&6
+    at_failed=:
   fi
-  exec 6<&-
-  wait
-else
-  # Run serially, avoid forks and other potential surprises.
-  for at_group in $at_groups; do
-    at_fn_group_prepare
-    if cd "$at_group_dir" &&
-       at_fn_test $at_group &&
-       . "$at_test_source"; then :; else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
-$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-      at_failed=:
-    fi
-    at_fn_group_postprocess
-    test -f "$at_stop_file" && break
-    at_first=false
-  done
-fi
+  at_func_group_postprocess
+  test -f "$at_stop_file" && break
+  at_first=false
+done
 
 # Wrap up the test suite with summary statistics.
 cd "$at_helper_dir"
@@ -1863,9 +1713,12 @@ set X $at_xfail_list; shift; at_xfail_count=$#
 set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
 set X $at_skip_list; shift; at_skip_count=$#
 
-as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
-as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
-as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 # Back to the top directory.
 cd "$at_dir"
@@ -1877,26 +1730,35 @@ at_stop_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: ending at: $at_stop_date" >&5
 case $at_start_time,$at_stop_time in
   [0-9]*,[0-9]*)
-    as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
-    as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
-    as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
-    as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
-    as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     $as_echo "$as_me: test suite duration: $at_duration" >&5
     ;;
 esac
 
 echo
-$as_echo "## ------------- ##
+cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
 echo
 {
   echo
-  $as_echo "## ------------- ##
+  cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1914,14 +1776,12 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
     at_result="$at_result $at_were run, one failed"
   fi
   at_result="$at_result unexpectedly and inhibited subsequent tests."
-  at_color=$at_red
 else
   # Don't you just love exponential explosion of the number of cases?
-  at_color=$at_red
   case $at_xpass_count:$at_fail_count:$at_xfail_count in
     # So far, so good.
-    0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
-    0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
+    0:0:0) at_result="$at_result $at_were successful." ;;
+    0:0:*) at_result="$at_result behaved as expected." ;;
 
     # Some unexpected failures
     0:*:0) at_result="$at_result $at_were run,
@@ -1967,16 +1827,18 @@ $at_skip_count tests were skipped." ;;
 esac
 
 if test $at_unexpected_count = 0; then
-  echo "$at_color$at_result$at_std"
+  echo "$at_result"
   echo "$at_result" >&5
 else
-  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&5
   {
     echo
-    $as_echo "## ------------------------ ##
+    cat <<\_ASBOX
+## ------------------------ ##
 ## Summary of the failures. ##
-## ------------------------ ##"
+## ------------------------ ##
+_ASBOX
 
     # Summary of failed and skipped tests.
     if test $at_fail_count != 0; then
@@ -1995,9 +1857,11 @@ else
       echo
     fi
     if test $at_fail_count != 0; then
-      $as_echo "## ---------------------- ##
+      cat <<\_ASBOX
+## ---------------------- ##
 ## Detailed failed tests. ##
-## ---------------------- ##"
+## ---------------------- ##
+_ASBOX
       echo
       for at_group in $at_fail_list
       do
@@ -2029,21 +1893,19 @@ _ASBOX
 _ASBOX
 
   echo
-  if $at_debug_p; then
-    at_msg='per-test log files'
-  else
-    at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
-  fi
-  $as_echo "Please send $at_msg and all information you think might help:
+  $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
 
    To: <opendap-tech at opendap.org>
-   Subject: [libdap 3.18.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point.  Its output may
-be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
+   Subject: [libdap 3.18.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 "
-  exit 1
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.  Its output may'
+    $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+    echo
+  fi
+    exit 1
 fi
 
 exit 0
@@ -2052,12 +1914,15 @@ exit 0
 ## Actual tests. ##
 ## ------------- ##
 #AT_START_1
-at_fn_group_banner 1 'DDSTest.at:48' \
-  "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds" ""
+# 1. DDSTest.at:48: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
+at_setup_line='DDSTest.at:48'
+at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds"
+$at_quiet $as_echo_n "  1: $at_desc"
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $as_echo "1. DDSTest.at:48: testing ..."
   $at_traceon
 
 
@@ -2065,82 +1930,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds
     baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.hacked.HDF.das.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:48: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:48"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:48: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:48"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:48: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:48"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:48: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:48"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:48 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:48"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_1
 #AT_START_2
-at_fn_group_banner 2 'DDSTest.at:49' \
-  "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds" ""
+# 2. DDSTest.at:49: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds
+at_setup_line='DDSTest.at:49'
+at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds"
+$at_quiet $as_echo_n "  2: $at_desc"
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $as_echo "2. DDSTest.at:49: testing ..."
   $at_traceon
 
 
@@ -2148,82 +2045,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds
     baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.das.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:49: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:49"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:49: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:49"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:49: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:49"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:49: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:49"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:49 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:49"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_2
 #AT_START_3
-at_fn_group_banner 3 'DDSTest.at:50' \
-  "DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds" ""
+# 3. DDSTest.at:50: DDS $abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds
+at_setup_line='DDSTest.at:50'
+at_desc="DDS \$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds"
+$at_quiet $as_echo_n "  3: $at_desc"
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $as_echo "3. DDSTest.at:50: testing ..."
   $at_traceon
 
 
@@ -2231,82 +2160,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds
     baseline=$abs_srcdir/dds-testsuite/3B42.980909.5.HDF.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:50: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:50"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:50: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:50"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:50: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:50"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:50: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:50"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:50 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:50"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_3
 #AT_START_4
-at_fn_group_banner 4 'DDSTest.at:51' \
-  "DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds" ""
+# 4. DDSTest.at:51: DDS $abs_srcdir/dds-testsuite/AsciiOutputTest1.dds
+at_setup_line='DDSTest.at:51'
+at_desc="DDS \$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds"
+$at_quiet $as_echo_n "  4: $at_desc"
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $as_echo "4. DDSTest.at:51: testing ..."
   $at_traceon
 
 
@@ -2314,82 +2275,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds
     baseline=$abs_srcdir/dds-testsuite/AsciiOutputTest1.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:51: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:51"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:51: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:51"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:51: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:51"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:51: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:51"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:51 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:51"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_4
 #AT_START_5
-at_fn_group_banner 5 'DDSTest.at:52' \
-  "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds" " "
+# 5. DDSTest.at:52: DDS $abs_srcdir/dds-testsuite/fnoc1.nc.das.dds
+at_setup_line='DDSTest.at:52'
+at_desc="DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds"
+$at_quiet $as_echo_n "  5: $at_desc "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $as_echo "5. DDSTest.at:52: testing ..."
   $at_traceon
 
 
@@ -2397,82 +2390,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds
     baseline=$abs_srcdir/dds-testsuite/fnoc1.nc.das.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:52: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:52"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:52: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:52"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:52: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:52"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:52: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:52"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:52 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:52"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_5
 #AT_START_6
-at_fn_group_banner 6 'DDSTest.at:53' \
-  "DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds" "     "
+# 6. DDSTest.at:53: DDS $abs_srcdir/dds-testsuite/fnoc1.nc.dds
+at_setup_line='DDSTest.at:53'
+at_desc="DDS \$abs_srcdir/dds-testsuite/fnoc1.nc.dds"
+$at_quiet $as_echo_n "  6: $at_desc     "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $as_echo "6. DDSTest.at:53: testing ..."
   $at_traceon
 
 
@@ -2480,82 +2505,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/fnoc1.nc.dds
     baseline=$abs_srcdir/dds-testsuite/fnoc1.nc.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:53: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:53"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:53: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:53"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:53: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:53"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:53: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:53"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:53 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:53"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_6
 #AT_START_7
-at_fn_group_banner 7 'DDSTest.at:54' \
-  "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds" ""
+# 7. DDSTest.at:54: DDS $abs_srcdir/dds-testsuite/S2000415.HDF.das.dds
+at_setup_line='DDSTest.at:54'
+at_desc="DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds"
+$at_quiet $as_echo_n "  7: $at_desc"
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $as_echo "7. DDSTest.at:54: testing ..."
   $at_traceon
 
 
@@ -2563,82 +2620,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds
     baseline=$abs_srcdir/dds-testsuite/S2000415.HDF.das.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:54: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:54"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:54: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:54"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:54: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:54"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:54: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:54"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:54 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:54"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_7
 #AT_START_8
-at_fn_group_banner 8 'DDSTest.at:55' \
-  "DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds" " "
+# 8. DDSTest.at:55: DDS $abs_srcdir/dds-testsuite/S2000415.HDF.dds
+at_setup_line='DDSTest.at:55'
+at_desc="DDS \$abs_srcdir/dds-testsuite/S2000415.HDF.dds"
+$at_quiet $as_echo_n "  8: $at_desc "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $as_echo "8. DDSTest.at:55: testing ..."
   $at_traceon
 
 
@@ -2646,82 +2735,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/S2000415.HDF.dds
     baseline=$abs_srcdir/dds-testsuite/S2000415.HDF.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:55: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:55"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:55: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:55"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:55: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:55"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:55: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:55"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:55 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:55"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_8
 #AT_START_9
-at_fn_group_banner 9 'DDSTest.at:56' \
-  "DDS \$abs_srcdir/dds-testsuite/test.1.dds" "       "
+# 9. DDSTest.at:56: DDS $abs_srcdir/dds-testsuite/test.1.dds
+at_setup_line='DDSTest.at:56'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.1.dds"
+$at_quiet $as_echo_n "  9: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $as_echo "9. DDSTest.at:56: testing ..."
   $at_traceon
 
 
@@ -2729,82 +2850,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.1.dds
     baseline=$abs_srcdir/dds-testsuite/test.1.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:56: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:56"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:56: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:56"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:56: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:56"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:56: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:56"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:56 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:56"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_9
 #AT_START_10
-at_fn_group_banner 10 'DDSTest.at:57' \
-  "DDS \$abs_srcdir/dds-testsuite/test.10.dds" "      "
+# 10. DDSTest.at:57: DDS $abs_srcdir/dds-testsuite/test.10.dds
+at_setup_line='DDSTest.at:57'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.10.dds"
+$at_quiet $as_echo_n " 10: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $as_echo "10. DDSTest.at:57: testing ..."
   $at_traceon
 
 
@@ -2812,82 +2965,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.10.dds
     baseline=$abs_srcdir/dds-testsuite/test.10.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:57: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:57"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:57: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:57"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:57: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:57"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:57: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:57"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_10
 #AT_START_11
-at_fn_group_banner 11 'DDSTest.at:58' \
-  "DDS \$abs_srcdir/dds-testsuite/test.11.dds" "      "
+# 11. DDSTest.at:58: DDS $abs_srcdir/dds-testsuite/test.11.dds
+at_setup_line='DDSTest.at:58'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.11.dds"
+$at_quiet $as_echo_n " 11: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $as_echo "11. DDSTest.at:58: testing ..."
   $at_traceon
 
 
@@ -2895,82 +3080,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.11.dds
     baseline=$abs_srcdir/dds-testsuite/test.11.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:58: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:58"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:58: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:58"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:58: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:58"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:58: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:58"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_11
 #AT_START_12
-at_fn_group_banner 12 'DDSTest.at:59' \
-  "DDS \$abs_srcdir/dds-testsuite/test.12.dds" "      "
+# 12. DDSTest.at:59: DDS $abs_srcdir/dds-testsuite/test.12.dds
+at_setup_line='DDSTest.at:59'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.12.dds"
+$at_quiet $as_echo_n " 12: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $as_echo "12. DDSTest.at:59: testing ..."
   $at_traceon
 
 
@@ -2978,82 +3195,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.12.dds
     baseline=$abs_srcdir/dds-testsuite/test.12.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:59: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:59"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:59: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:59"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:59: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:59"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:59: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:59"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_12
 #AT_START_13
-at_fn_group_banner 13 'DDSTest.at:60' \
-  "DDS \$abs_srcdir/dds-testsuite/test.13.dds" "      "
+# 13. DDSTest.at:60: DDS $abs_srcdir/dds-testsuite/test.13.dds
+at_setup_line='DDSTest.at:60'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.13.dds"
+$at_quiet $as_echo_n " 13: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $as_echo "13. DDSTest.at:60: testing ..."
   $at_traceon
 
 
@@ -3061,82 +3310,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.13.dds
     baseline=$abs_srcdir/dds-testsuite/test.13.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:60: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:60"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:60: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:60"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:60: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:60"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:60: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:60"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_13
 #AT_START_14
-at_fn_group_banner 14 'DDSTest.at:61' \
-  "DDS \$abs_srcdir/dds-testsuite/test.14.dds" "      "
+# 14. DDSTest.at:61: DDS $abs_srcdir/dds-testsuite/test.14.dds
+at_setup_line='DDSTest.at:61'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.14.dds"
+$at_quiet $as_echo_n " 14: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $as_echo "14. DDSTest.at:61: testing ..."
   $at_traceon
 
 
@@ -3144,82 +3425,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.14.dds
     baseline=$abs_srcdir/dds-testsuite/test.14.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:61: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:61"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:61: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:61"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:61: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:61"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:61: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:61"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_14
 #AT_START_15
-at_fn_group_banner 15 'DDSTest.at:62' \
-  "DDS \$abs_srcdir/dds-testsuite/test.15.dds" "      "
+# 15. DDSTest.at:62: DDS $abs_srcdir/dds-testsuite/test.15.dds
+at_setup_line='DDSTest.at:62'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.15.dds"
+$at_quiet $as_echo_n " 15: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $as_echo "15. DDSTest.at:62: testing ..."
   $at_traceon
 
 
@@ -3227,82 +3540,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.15.dds
     baseline=$abs_srcdir/dds-testsuite/test.15.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:62: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:62"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:62: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:62"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:62: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:62"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:62: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:62"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_15
 #AT_START_16
-at_fn_group_banner 16 'DDSTest.at:63' \
-  "DDS \$abs_srcdir/dds-testsuite/test.16.dds" "      "
+# 16. DDSTest.at:63: DDS $abs_srcdir/dds-testsuite/test.16.dds
+at_setup_line='DDSTest.at:63'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.16.dds"
+$at_quiet $as_echo_n " 16: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $as_echo "16. DDSTest.at:63: testing ..."
   $at_traceon
 
 
@@ -3310,82 +3655,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.16.dds
     baseline=$abs_srcdir/dds-testsuite/test.16.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:63: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:63"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:63: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:63"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:63: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:63"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:63: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:63"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_16
 #AT_START_17
-at_fn_group_banner 17 'DDSTest.at:64' \
-  "DDS \$abs_srcdir/dds-testsuite/test.17.dds" "      "
+# 17. DDSTest.at:64: DDS $abs_srcdir/dds-testsuite/test.17.dds
+at_setup_line='DDSTest.at:64'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.17.dds"
+$at_quiet $as_echo_n " 17: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $as_echo "17. DDSTest.at:64: testing ..."
   $at_traceon
 
 
@@ -3393,82 +3770,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.17.dds
     baseline=$abs_srcdir/dds-testsuite/test.17.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:64: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:64"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:64: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:64"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:64: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:64"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:64: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:64"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_17
 #AT_START_18
-at_fn_group_banner 18 'DDSTest.at:65' \
-  "DDS \$abs_srcdir/dds-testsuite/test.18.dds" "      "
+# 18. DDSTest.at:65: DDS $abs_srcdir/dds-testsuite/test.18.dds
+at_setup_line='DDSTest.at:65'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.18.dds"
+$at_quiet $as_echo_n " 18: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $as_echo "18. DDSTest.at:65: testing ..."
   $at_traceon
 
 
@@ -3476,82 +3885,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.18.dds
     baseline=$abs_srcdir/dds-testsuite/test.18.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:65: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:65"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:65: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:65"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:65: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:65"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:65: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:65"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:65 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:65"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_18
 #AT_START_19
-at_fn_group_banner 19 'DDSTest.at:66' \
-  "DDS \$abs_srcdir/dds-testsuite/test.19.dds" "      "
+# 19. DDSTest.at:66: DDS $abs_srcdir/dds-testsuite/test.19.dds
+at_setup_line='DDSTest.at:66'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.19.dds"
+$at_quiet $as_echo_n " 19: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $as_echo "19. DDSTest.at:66: testing ..."
   $at_traceon
 
 
@@ -3559,82 +4000,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.19.dds
     baseline=$abs_srcdir/dds-testsuite/test.19.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:66: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:66"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:66: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:66"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:66: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:66"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:66: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:66"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_19
 #AT_START_20
-at_fn_group_banner 20 'DDSTest.at:67' \
-  "DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds" " "
+# 20. DDSTest.at:67: DDS $abs_srcdir/dds-testsuite/test.19b.das.dds
+at_setup_line='DDSTest.at:67'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.19b.das.dds"
+$at_quiet $as_echo_n " 20: $at_desc "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $as_echo "20. DDSTest.at:67: testing ..."
   $at_traceon
 
 
@@ -3642,82 +4115,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.19b.das.dds
     baseline=$abs_srcdir/dds-testsuite/test.19b.das.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:67: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:67"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:67: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:67"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:67: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:67"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:67: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:67"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_20
 #AT_START_21
-at_fn_group_banner 21 'DDSTest.at:68' \
-  "DDS \$abs_srcdir/dds-testsuite/test.19b.dds" "     "
+# 21. DDSTest.at:68: DDS $abs_srcdir/dds-testsuite/test.19b.dds
+at_setup_line='DDSTest.at:68'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.19b.dds"
+$at_quiet $as_echo_n " 21: $at_desc     "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $as_echo "21. DDSTest.at:68: testing ..."
   $at_traceon
 
 
@@ -3725,82 +4230,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.19b.dds
     baseline=$abs_srcdir/dds-testsuite/test.19b.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:68: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:68"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:68: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:68"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:68: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:68"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:68: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:68"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:68 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:68"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_21
 #AT_START_22
-at_fn_group_banner 22 'DDSTest.at:69' \
-  "DDS \$abs_srcdir/dds-testsuite/test.2.dds" "       "
+# 22. DDSTest.at:69: DDS $abs_srcdir/dds-testsuite/test.2.dds
+at_setup_line='DDSTest.at:69'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.2.dds"
+$at_quiet $as_echo_n " 22: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $as_echo "22. DDSTest.at:69: testing ..."
   $at_traceon
 
 
@@ -3808,82 +4345,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.2.dds
     baseline=$abs_srcdir/dds-testsuite/test.2.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:69: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:69"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:69: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:69"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:69: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:69"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:69: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:69"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_22
 #AT_START_23
-at_fn_group_banner 23 'DDSTest.at:70' \
-  "DDS \$abs_srcdir/dds-testsuite/test.20.dds" "      "
+# 23. DDSTest.at:70: DDS $abs_srcdir/dds-testsuite/test.20.dds
+at_setup_line='DDSTest.at:70'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.20.dds"
+$at_quiet $as_echo_n " 23: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $as_echo "23. DDSTest.at:70: testing ..."
   $at_traceon
 
 
@@ -3891,82 +4460,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.20.dds
     baseline=$abs_srcdir/dds-testsuite/test.20.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:70: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:70"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:70: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:70"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:70: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:70"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:70: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:70"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_23
 #AT_START_24
-at_fn_group_banner 24 'DDSTest.at:71' \
-  "DDS \$abs_srcdir/dds-testsuite/test.3.dds" "       "
+# 24. DDSTest.at:71: DDS $abs_srcdir/dds-testsuite/test.3.dds
+at_setup_line='DDSTest.at:71'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.3.dds"
+$at_quiet $as_echo_n " 24: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $as_echo "24. DDSTest.at:71: testing ..."
   $at_traceon
 
 
@@ -3974,82 +4575,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.3.dds
     baseline=$abs_srcdir/dds-testsuite/test.3.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:71: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:71"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:71: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:71"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:71: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:71"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:71: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:71"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_24
 #AT_START_25
-at_fn_group_banner 25 'DDSTest.at:72' \
-  "DDS \$abs_srcdir/dds-testsuite/test.4.dds" "       "
+# 25. DDSTest.at:72: DDS $abs_srcdir/dds-testsuite/test.4.dds
+at_setup_line='DDSTest.at:72'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.4.dds"
+$at_quiet $as_echo_n " 25: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $as_echo "25. DDSTest.at:72: testing ..."
   $at_traceon
 
 
@@ -4057,82 +4690,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.4.dds
     baseline=$abs_srcdir/dds-testsuite/test.4.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:72: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:72"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:72 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:72: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:72"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:72 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:72: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:72"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:72 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:72: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:72"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:72 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:72"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_25
 #AT_START_26
-at_fn_group_banner 26 'DDSTest.at:73' \
-  "DDS \$abs_srcdir/dds-testsuite/test.6.dds" "       "
+# 26. DDSTest.at:73: DDS $abs_srcdir/dds-testsuite/test.6.dds
+at_setup_line='DDSTest.at:73'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.6.dds"
+$at_quiet $as_echo_n " 26: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $as_echo "26. DDSTest.at:73: testing ..."
   $at_traceon
 
 
@@ -4140,82 +4805,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.6.dds
     baseline=$abs_srcdir/dds-testsuite/test.6.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:73: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:73"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:73 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:73: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:73"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:73 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:73: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:73"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:73 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:73: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:73"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:73 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:73"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_26
 #AT_START_27
-at_fn_group_banner 27 'DDSTest.at:74' \
-  "DDS \$abs_srcdir/dds-testsuite/test.7.dds" "       "
+# 27. DDSTest.at:74: DDS $abs_srcdir/dds-testsuite/test.7.dds
+at_setup_line='DDSTest.at:74'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.7.dds"
+$at_quiet $as_echo_n " 27: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $as_echo "27. DDSTest.at:74: testing ..."
   $at_traceon
 
 
@@ -4223,82 +4920,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.7.dds
     baseline=$abs_srcdir/dds-testsuite/test.7.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:74: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:74"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:74 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:74: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:74"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:74 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:74: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:74"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:74 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:74: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:74"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:74 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:74"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_27
 #AT_START_28
-at_fn_group_banner 28 'DDSTest.at:75' \
-  "DDS \$abs_srcdir/dds-testsuite/test.8.dds" "       "
+# 28. DDSTest.at:75: DDS $abs_srcdir/dds-testsuite/test.8.dds
+at_setup_line='DDSTest.at:75'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.8.dds"
+$at_quiet $as_echo_n " 28: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $as_echo "28. DDSTest.at:75: testing ..."
   $at_traceon
 
 
@@ -4306,82 +5035,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.8.dds
     baseline=$abs_srcdir/dds-testsuite/test.8.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:75: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:75"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:75 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:75: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:75"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:75 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:75: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:75"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:75 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:75: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:75"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:75 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:75"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_28
 #AT_START_29
-at_fn_group_banner 29 'DDSTest.at:76' \
-  "DDS \$abs_srcdir/dds-testsuite/test.9.dds" "       "
+# 29. DDSTest.at:76: DDS $abs_srcdir/dds-testsuite/test.9.dds
+at_setup_line='DDSTest.at:76'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.9.dds"
+$at_quiet $as_echo_n " 29: $at_desc       "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $as_echo "29. DDSTest.at:76: testing ..."
   $at_traceon
 
 
@@ -4389,82 +5150,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.9.dds
     baseline=$abs_srcdir/dds-testsuite/test.9.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:76: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:76"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:76 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:76: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:76"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:76 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:76: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:76"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:76 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:76: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:76"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:76 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:76"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_29
 #AT_START_30
-at_fn_group_banner 30 'DDSTest.at:80' \
-  "DDS \$abs_srcdir/dds-testsuite/test.21.dds" "      "
+# 30. DDSTest.at:80: DDS $abs_srcdir/dds-testsuite/test.21.dds
+at_setup_line='DDSTest.at:80'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.21.dds"
+$at_quiet $as_echo_n " 30: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $as_echo "30. DDSTest.at:80: testing ..."
   $at_traceon
 
 
@@ -4472,82 +5265,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.21.dds
     baseline=$abs_srcdir/dds-testsuite/test.21.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:80: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:80"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:80: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:80"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:80: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:80"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:80: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:80"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_30
 #AT_START_31
-at_fn_group_banner 31 'DDSTest.at:81' \
-  "DDS \$abs_srcdir/dds-testsuite/test.22.dds" "      "
+# 31. DDSTest.at:81: DDS $abs_srcdir/dds-testsuite/test.22.dds
+at_setup_line='DDSTest.at:81'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.22.dds"
+$at_quiet $as_echo_n " 31: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $as_echo "31. DDSTest.at:81: testing ..."
   $at_traceon
 
 
@@ -4555,82 +5380,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.22.dds
     baseline=$abs_srcdir/dds-testsuite/test.22.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:81: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:81"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:81 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:81: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:81"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:81 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:81: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:81"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:81 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:81: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:81"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:81 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:81"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_31
 #AT_START_32
-at_fn_group_banner 32 'DDSTest.at:82' \
-  "DDS \$abs_srcdir/dds-testsuite/test.23.dds" "      "
+# 32. DDSTest.at:82: DDS $abs_srcdir/dds-testsuite/test.23.dds
+at_setup_line='DDSTest.at:82'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.23.dds"
+$at_quiet $as_echo_n " 32: $at_desc      "
 at_xfail=no
       test "" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $as_echo "32. DDSTest.at:82: testing ..."
   $at_traceon
 
 
@@ -4638,82 +5495,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.23.dds
     baseline=$abs_srcdir/dds-testsuite/test.23.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:82: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:82"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:82 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:82: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:82"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:82 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:82: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:82"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:82 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:82: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:82"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:82 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:82"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_32
 #AT_START_33
-at_fn_group_banner 33 'DDSTest.at:83' \
-  "DDS \$abs_srcdir/dds-testsuite/test.24.dds" "      "
+# 33. DDSTest.at:83: DDS $abs_srcdir/dds-testsuite/test.24.dds
+at_setup_line='DDSTest.at:83'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.24.dds"
+$at_quiet $as_echo_n " 33: $at_desc      "
 at_xfail=no
       test "xpass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $as_echo "33. DDSTest.at:83: testing ..."
   $at_traceon
 
 
@@ -4721,82 +5610,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.24.dds
     baseline=$abs_srcdir/dds-testsuite/test.24.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:83: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:83"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:83: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:83"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:83: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:83"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:83: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:83"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_33
 #AT_START_34
-at_fn_group_banner 34 'DDSTest.at:86' \
-  "DDS \$abs_srcdir/dds-testsuite/test.25.dds" "      "
+# 34. DDSTest.at:86: DDS $abs_srcdir/dds-testsuite/test.25.dds
+at_setup_line='DDSTest.at:86'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.25.dds"
+$at_quiet $as_echo_n " 34: $at_desc      "
 at_xfail=no
       test "xpass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $as_echo "34. DDSTest.at:86: testing ..."
   $at_traceon
 
 
@@ -4804,82 +5725,114 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.25.dds
     baseline=$abs_srcdir/dds-testsuite/test.25.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:86: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:86"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:86 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:86: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:86"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:86 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:86: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:86"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:86 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:86: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:86"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:86 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:86"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_34
 #AT_START_35
-at_fn_group_banner 35 'DDSTest.at:87' \
-  "DDS \$abs_srcdir/dds-testsuite/test.26.dds" "      "
+# 35. DDSTest.at:87: DDS $abs_srcdir/dds-testsuite/test.26.dds
+at_setup_line='DDSTest.at:87'
+at_desc="DDS \$abs_srcdir/dds-testsuite/test.26.dds"
+$at_quiet $as_echo_n " 35: $at_desc      "
 at_xfail=no
       test "xpass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $as_echo "35. DDSTest.at:87: testing ..."
   $at_traceon
 
 
@@ -4887,72 +5840,101 @@ at_xfail=no
     input=$abs_srcdir/dds-testsuite/test.26.dds
     baseline=$abs_srcdir/dds-testsuite/test.26.dds.base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
         # The --baselines=yes option works only for tests that write to stdout
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:87: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:87"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:87 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:87: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DDSTest.at:87"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-$at_failed && at_fn_log_failure
+echo DDSTest.at:87 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
         # Added '|| true' to ensure the command returns '0'
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:87: \$abs_builddir/dds-test -p < \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dds-test -p < $input || true" "DDSTest.at:87"
-( $at_check_trace; $abs_builddir/dds-test -p < $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DDSTest.at:87 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dds-test -p < $input || true"; then
+  ( $at_traceon; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dds-test -p < $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
         # Need to compare either stdout or stderr
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DDSTest.at:87: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DDSTest.at:87"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DDSTest.at:87 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DDSTest.at:87"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_35
diff --git a/tests/DMRTest b/tests/DMRTest
index 4e44854..5e144d9 100755
--- a/tests/DMRTest
+++ b/tests/DMRTest
@@ -1,17 +1,17 @@
 #! /bin/sh
-# Generated from DMRTest.at by GNU Autoconf 2.69.
-#
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Generated from DMRTest.at by GNU Autoconf 2.63.
 #
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,15 +19,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -35,13 +43,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -52,7 +54,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -75,6 +77,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -84,16 +93,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -105,16 +113,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -126,319 +130,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+if as_func_success; then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+if as_func_ret_success; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
+
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
+fi
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-} # as_fn_mkdir_p
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
+if as_func_ret_success; then
+  :
 else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
 
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -455,12 +470,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -469,19 +482,30 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -495,29 +519,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -547,11 +591,6 @@ at_errexit_p=false
 # Shall we be verbose?  ':' means no, empty means yes.
 at_verbose=:
 at_quiet=
-# Running several jobs in parallel, 0 means as many as test groups.
-at_jobs=1
-at_traceon=:
-at_trace_echo=:
-at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -566,8 +605,6 @@ at_list_p=false
 at_clean=false
 # Test groups to run
 at_groups=
-# Whether to rerun failed tests.
-at_recheck=
 # Whether a write failure occurred
 at_write_fail=0
 
@@ -581,10 +618,10 @@ esac
 # Whether -C is in effect.
 at_change_dir=false
 
-# Whether to enable colored test results.
-at_color=no
 # List of the tested programs.
 at_tested=''
+# List of the all the test groups.
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146  [...]
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -680,11 +717,11 @@ at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse;
 88;DMRTest.at:323;intern test_array_14.xml;intern;
 89;DMRTest.at:325;intern test_simple_6.2.xml;intern;
 90;DMRTest.at:326;intern test_simple_6.3.xml;intern;
-91;DMRTest.at:342;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce;
-92;DMRTest.at:342;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce;
-93;DMRTest.at:342;trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base;trans_ce;
-94;DMRTest.at:342;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce;
-95;DMRTest.at:342;trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base;trans_ce;
+91;DMRTest.at:334;trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base;trans_ce;
+92;DMRTest.at:334;trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base;trans_ce;
+93;DMRTest.at:334;trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base;trans_ce;
+94;DMRTest.at:334;trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base;trans_ce;
+95;DMRTest.at:334;trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base;trans_ce;
 96;DMRTest.at:346;trans ce test_array_4.xml a test_array_4.xml.1.trans_base;trans_ce;
 97;DMRTest.at:347;trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base;trans_ce;
 98;DMRTest.at:349;trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base;trans_ce;
@@ -814,26 +851,32 @@ at_help_all="1;DMRTest.at:211;parse dmr-testsuite/test_simple_1.xml;parse;
 222;DMRTest.at:554;filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base;filter;
 223;DMRTest.at:555;filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base;filter;
 224;DMRTest.at:556;filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base;filter;
+225;DMRTest.at:563;filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base;filter;
+226;DMRTest.at:564;filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base;filter;
+227;DMRTest.at:565;filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base;filter;
+228;DMRTest.at:567;filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base;filter;
+229;DMRTest.at:568;filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base;filter;
+230;DMRTest.at:569;filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base;filter;
+231;DMRTest.at:571;filter names_with_spaces2.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base;filter;
+232;DMRTest.at:572;filter names_with_spaces2.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base;filter;
 "
-# List of the all the test groups.
-at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
 
-# at_fn_validate_ranges NAME...
-# -----------------------------
-# Validate and normalize the test group number contained in each variable
-# NAME. Leading zeroes are treated as decimal.
-at_fn_validate_ranges ()
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME.  Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
 {
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 224; then
+    if test $at_value -lt 1 || test $at_value -gt 232; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
     case $at_value in
       0*) # We want to treat leading 0 as decimal, like expr and test, but
-	  # AS_VAR_ARITH treats it as octal if it uses $(( )).
+	  # at_func_arith treats it as octal if it uses $(( )).
 	  # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
 	  # expr fork, but it is not worth the effort to determine if the
 	  # shell supports XSI when the user can just avoid leading 0.
@@ -859,8 +902,8 @@ do
   fi
 
   case $at_option in
-  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
-  *)    at_optarg= ;;
+  *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
+  *)   at_optarg= ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -882,19 +925,6 @@ do
 	at_clean=:
 	;;
 
-    --color )
-	at_color=always
-	;;
-    --color=* )
-	case $at_optarg in
-	no | never | none) at_color=never ;;
-	auto | tty | if-tty) at_color=auto ;;
-	always | yes | force) at_color=always ;;
-	*) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
-	   as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
-	esac
-	;;
-
     --debug | -d )
 	at_debug_p=:
 	;;
@@ -909,31 +939,29 @@ do
 	;;
 
     --trace | -x )
-	at_traceon='set -x'
-	at_trace_echo=echo
-	at_check_filter_trace=at_fn_filter_trace
+	at_traceon='set -x'; at_traceoff='set +x'
 	;;
 
     [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
-	at_fn_validate_ranges at_option
-	as_fn_append at_groups "$at_option$as_nl"
+	at_func_validate_ranges at_option
+	at_groups="$at_groups$at_option "
 	;;
 
     # Ranges
     [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
 	at_range_start=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_start
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,$p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.* \('$at_range_start' \)/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
 	at_range_end=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '1,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -949,10 +977,11 @@ do
 	  at_range_end=$at_range_start
 	  at_range_start=$at_tmp
 	fi
-	at_fn_validate_ranges at_range_start at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.*\( '$at_range_start' \)/\1/' \
+	      -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     # Directory selection.
@@ -962,25 +991,6 @@ do
     --directory=* )
 	at_change_dir=:
 	at_dir=$at_optarg
-	if test x- = "x$at_dir" ; then
-	  at_dir=./-
-	fi
-	;;
-
-    # Parallel execution.
-    --jobs | -j )
-	at_jobs=0
-	;;
-    --jobs=* | -j[0-9]* )
-	if test -n "$at_optarg"; then
-	  at_jobs=$at_optarg
-	else
-	  at_jobs=`expr X$at_option : 'X-j\(.*\)'`
-	fi
-	case $at_jobs in *[!0-9]*)
-	  at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
-	  as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
-	esac
 	;;
 
     # Keywords.
@@ -1007,12 +1017,11 @@ do
 	  at_groups_selected=`$as_echo "$at_groups_selected" |
 	      grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
 	done
-	# Smash the keywords.
-	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-	as_fn_append at_groups "$at_groups_selected$as_nl"
-	;;
-    --recheck)
-	at_recheck=:
+	# Smash the newlines.
+	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+	  tr "$as_nl" ' '
+	`
+	at_groups="$at_groups$at_groups_selected "
 	;;
     --baselines )
 	at_prev=--baselines
@@ -1030,12 +1039,14 @@ do
 	# Reject names that are not valid shell variable names.
 	case $at_envvar in
 	  '' | [0-9]* | *[!_$as_cr_alnum]* )
-	    as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
+	    { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+   { (exit 1); exit 1; }; } ;;
 	esac
 	at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
 	# Export now, but save eval for later and for debug scripts.
 	export $at_envvar
-	as_fn_append at_debug_args " $at_envvar='$at_value'"
+	at_debug_args="$at_debug_args $at_envvar='$at_value'"
 	;;
 
      *) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -1046,54 +1057,32 @@ do
 done
 
 # Verify our last option didn't require an argument
-if test -n "$at_prev"; then :
-  as_fn_error $? "\`$at_prev' requires an argument"
+if test -n "$at_prev"; then
+  { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
 
 # Selected test groups.
-if test -z "$at_groups$at_recheck"; then
+if test -z "$at_groups"; then
   at_groups=$at_groups_all
 else
-  if test -n "$at_recheck" && test -r "$at_suite_log"; then
-    at_oldfails=`sed -n '
-      /^Failed tests:$/,/^Skipped tests:$/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^Unexpected passes:$/,/^## Detailed failed tests/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^## Detailed failed tests/q
-      ' "$at_suite_log"`
-    as_fn_append at_groups "$at_oldfails$as_nl"
-  fi
   # Sort the tests, removing duplicates.
-  at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
-fi
-
-if test x"$at_color" = xalways \
-   || { test x"$at_color" = xauto && test -t 1; }; then
-  at_red=`printf '\033[0;31m'`
-  at_grn=`printf '\033[0;32m'`
-  at_lgn=`printf '\033[1;32m'`
-  at_blu=`printf '\033[1;34m'`
-  at_std=`printf '\033[m'`
-else
-  at_red= at_grn= at_lgn= at_blu= at_std=
+  at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
 fi
 
 ##
 ## Process package specific options when _not_ supplied.
 ##
 
-if $at_arg_given_baselines; then :
-
+if $at_arg_given_baselines; then
+  :
 else
   baselines=
 fi
 
+
 # Help message.
 if $at_help_p; then
   cat <<_ATEOF || at_write_fail=1
@@ -1102,17 +1091,16 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
 Run all the tests, or the selected TESTS, given by numeric ranges, and
 save a detailed log file.  Upon failure, create debugging scripts.
 
-Do not change environment variables directly.  Instead, set them via
-command line arguments.  Set \`AUTOTEST_PATH' to select the executables
+You should not change environment variables unless explicitly passed
+as command line arguments.  Set \`AUTOTEST_PATH' to select the executables
 to exercise.  Each relative directory is expanded as build and source
-directories relative to the top level of this distribution.
-E.g., from within the build directory /tmp/foo-1.0, invoking this:
+directories relatively to the top level of this distribution.  E.g.,
 
   $ $0 AUTOTEST_PATH=bin
 
-is equivalent to the following, assuming the source directory is /src/foo-1.0:
+possibly amounts into
 
-  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
 _ATEOF
 cat <<_ATEOF || at_write_fail=1
 
@@ -1127,14 +1115,9 @@ cat <<_ATEOF || at_write_fail=1
 Execution tuning:
   -C, --directory=DIR
                  change to directory DIR before starting
-      --color[=never|auto|always]
-                 enable colored test results on terminal, or always
-  -j, --jobs[=N]
-                 Allow N jobs at once; infinite jobs with no arg (default 1)
   -k, --keywords=KEYWORDS
                  select the tests matching all the comma-separated KEYWORDS
                  multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-      --recheck  select all tests that failed or passed unexpectedly last time
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
                  default for debugging scripts
@@ -1160,69 +1143,64 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-libdap 3.18.1 test suite: dmr-test test groups:
+libdap 3.18.2 test suite: dmr-test test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
-  # Pass an empty line as separator between selected groups and help.
-  $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-    awk 'NF == 1 && FS != ";" {
-	   selected[$ 1] = 1
+  # Passing at_groups is tricky.  We cannot use it to form a literal string
+  # or regexp because of the limitation of AIX awk.  And Solaris' awk
+  # doesn't grok more than 99 fields in a record, so we have to use `split'.
+  # at_groups needs to be space-separated for this script to work.
+  case $at_groups in
+    *"$as_nl"* )
+      at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+  esac
+  $as_echo "$at_groups$as_nl$at_help_all" |
+    awk 'BEGIN { FS = ";" }
+	 NR == 1 {
+	   for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
 	   next
 	 }
-	 /^$/ { FS = ";" }
-	 NF > 0 {
+	 {
 	   if (selected[$ 1]) {
 	     printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-	     if ($ 4) {
-	       lmax = 79
-	       indent = "     "
-	       line = indent
-	       len = length (line)
-	       n = split ($ 4, a, " ")
-	       for (i = 1; i <= n; i++) {
-		 l = length (a[i]) + 1
-		 if (i > 1 && len + l > lmax) {
-		   print line
-		   line = indent " " a[i]
-		   len = length (line)
-		 } else {
-		   line = line " " a[i]
-		   len += l
-		 }
-	       }
-	       if (n)
-		 print line
-	     }
+	     if ($ 4) printf "      %s\n", $ 4
 	   }
 	 }' || at_write_fail=1
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (libdap 3.18.1)" &&
-  cat <<\_ATEOF || at_write_fail=1
+  $as_echo "$as_me (libdap 3.18.2)" &&
+  cat <<\_ACEOF || at_write_fail=1
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
-_ATEOF
+_ACEOF
   exit $at_write_fail
 fi
 
-# Should we print banners?  Yes if more than one test is run.
-case $at_groups in #(
-  *$as_nl* )
-      at_print_banners=: ;; #(
+# Should we print banners?  at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+  *' '*' '* | *"$as_nl"*"$as_nl"* )
+      at_print_banners=: ;;
   * ) at_print_banners=false ;;
 esac
-# Text for banner N, set to a single space once printed.
+# Text for banner N, set to empty once printed.
 
 # Take any -C into account.
 if $at_change_dir ; then
+  if test x- = "x$at_dir" ; then
+    at_dir=./-
+  fi
   test x != "x$at_dir" && cd "$at_dir" \
-    || as_fn_error $? "unable to change directory"
+    || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+   { (exit 1); exit 1; }; }
   at_dir=`pwd`
 fi
 
@@ -1230,11 +1208,13 @@ fi
 for at_file in atconfig atlocal
 do
   test -r $at_file || continue
-  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+  . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+   { (exit 1); exit 1; }; }
 done
 
 # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: "${at_top_build_prefix=$at_top_builddir}"
+: ${at_top_build_prefix=$at_top_builddir}
 
 # Perform any assignments requested during argument parsing.
 eval "$at_debug_args"
@@ -1245,7 +1225,8 @@ if test -n "$at_top_srcdir"; then
   builddir=../..
   for at_dir_var in srcdir top_srcdir top_build_prefix
   do
-    eval at_val=\$at_$at_dir_var
+    at_val=`eval 'as_val=${'at_$at_dir_var'}
+		 $as_echo "$as_val"'`
     case $at_val in
       [\\/$]* | ?:[\\/]* ) at_prefix= ;;
       *) at_prefix=../../ ;;
@@ -1254,9 +1235,9 @@ if test -n "$at_top_srcdir"; then
   done
 fi
 
-## -------------------- ##
-## Directory structure. ##
-## -------------------- ##
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
 
 # This is the set of directories and files used by this script
 # (non-literals are capitalized):
@@ -1287,14 +1268,12 @@ fi
 # The directory the whole suite works in.
 # Should be absolute to let the user `cd' at will.
 at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite ($at_dir might have changed since earlier).
+# The file containing the suite.
 at_suite_log=$at_dir/$as_me.log
 # The directory containing helper files per test group.
 at_helper_dir=$at_suite_dir/at-groups
 # Stop file: if it exists, do not start new jobs.
 at_stop_file=$at_suite_dir/at-stop
-# The fifo used for the job dispatcher.
-at_job_fifo=$at_suite_dir/at-job-fifo
 
 if $at_clean; then
   test -d "$at_suite_dir" &&
@@ -1318,23 +1297,23 @@ for as_dir in $AUTOTEST_PATH $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
+  test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
 case $as_dir in
   [\\/]* | ?:[\\/]* )
-    as_fn_append at_path "$as_dir"
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_build_prefix"; then
       # Stand-alone test suite.
-      as_fn_append at_path "$as_dir"
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
-      as_fn_append at_path "$at_top_srcdir/$as_dir"
+      at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 
@@ -1348,7 +1327,7 @@ for as_dir in $at_path
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -d "$as_dir" || continue
+  test -d "$as_dir" || continue
 case $as_dir in
   [\\/]* | ?:[\\/]* ) ;;
   * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1356,18 +1335,15 @@ esac
 case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
   *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
   $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
-  *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
+  *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-
-
-
 # 5 is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
@@ -1377,28 +1353,43 @@ fi
 exec 5>>"$at_suite_log"
 
 # Banners and logs.
-$as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: dmr-test. ##
-## ----------------------------------- ##"
+cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: dmr-test. ##
+## ----------------------------------- ##
+_ASBOX
 {
-  $as_echo "## ----------------------------------- ##
-## libdap 3.18.1 test suite: dmr-test. ##
-## ----------------------------------- ##"
+  cat <<\_ASBOX
+## ----------------------------------- ##
+## libdap 3.18.2 test suite: dmr-test. ##
+## ----------------------------------- ##
+_ASBOX
   echo
 
   $as_echo "$as_me: command line was:"
   $as_echo "  \$ $0 $at_cli_args"
   echo
 
-  # If ChangeLog exists, list a few lines in case it might help determining
-  # the exact version.
-  if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
-    $as_echo "## ---------- ##
-## ChangeLog. ##
-## ---------- ##"
-    echo
-    sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
+  # Try to find a few ChangeLogs in case it might help determining the
+  # exact version.  Use the relative dir: if the top dir is a symlink,
+  # find will not follow it (and options to follow the links are not
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
+  if test -n "$at_top_srcdir"; then
+    cat <<\_ASBOX
+## ----------- ##
+## ChangeLogs. ##
+## ----------- ##
+_ASBOX
     echo
+    for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
+    do
+      $as_echo "$as_me: $at_file:"
+      sed 's/^/| /;10q' $at_file
+      echo
+    done
+
   fi
 
   {
@@ -1431,8 +1422,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 }
@@ -1449,80 +1440,53 @@ IFS=$as_save_IFS
 } >&5
 
 
-## ------------------------- ##
-## Autotest shell functions. ##
-## ------------------------- ##
+## --------------- ##
+## Shell functions ##
+## --------------- ##
 
-# at_fn_banner NUMBER
-# -------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups and
-# this particular banner has not yet been printed.
-at_fn_banner ()
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
 {
   $at_print_banners || return 0
   eval at_banner_text=\$at_banner_text_$1
-  test "x$at_banner_text" = "x " && return 0
-  eval "at_banner_text_$1=\" \""
-  if test -z "$at_banner_text"; then
-    $at_first || echo
-  else
-    $as_echo "$as_nl$at_banner_text$as_nl"
-  fi
-} # at_fn_banner
-
-# at_fn_check_prepare_notrace REASON LINE
-# ---------------------------------------
-# Perform AT_CHECK preparations for the command at LINE for an untraceable
-# command; REASON is the reason for disabling tracing.
-at_fn_check_prepare_notrace ()
-{
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
-  $as_echo "$2" >"$at_check_line_file"
-  at_check_trace=: at_check_filter=:
-  : >"$at_stdout"; : >"$at_stderr"
-}
-
-# at_fn_check_prepare_trace LINE
-# ------------------------------
-# Perform AT_CHECK preparations for the command at LINE for a traceable
-# command.
-at_fn_check_prepare_trace ()
-{
-  $as_echo "$1" >"$at_check_line_file"
-  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
-  : >"$at_stdout"; : >"$at_stderr"
-}
+  test "x$at_banner_text" = x && return 0
+  eval at_banner_text_$1=
+  $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
 
-# at_fn_check_prepare_dynamic COMMAND LINE
-# ----------------------------------------
-# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
-# preparation function.
-at_fn_check_prepare_dynamic ()
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
 {
-  case $1 in
-    *$as_nl*)
-      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
-    *)
-      at_fn_check_prepare_trace "$2" ;;
+  case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+    return 1 ;;
+ *) return 0 ;;
   esac
 }
 
-# at_fn_filter_trace
-# ------------------
-# Remove the lines in the file "$at_stderr" generated by "set -x" and print
-# them to stderr.
-at_fn_filter_trace ()
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr").  Return the exit code EXIT-CODE.
+at_func_filter_trace ()
 {
-  mv "$at_stderr" "$at_stder1"
   grep '^ *+' "$at_stder1" >&2
   grep -v '^ *+' "$at_stder1" >"$at_stderr"
+  return $1
 }
 
-# at_fn_log_failure FILE-LIST
-# ---------------------------
+# at_func_log_failure FILE-LIST
+# -----------------------------
 # Copy the files in the list on stdout with a "> " prefix, and exit the shell
 # with a failure exit code.
-at_fn_log_failure ()
+at_func_log_failure ()
 {
   for file
     do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1530,62 +1494,56 @@ at_fn_log_failure ()
   exit 1
 }
 
-# at_fn_check_skip EXIT-CODE LINE
-# -------------------------------
-# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
-# the test group subshell with that same exit code. Use LINE in any report
-# about test failure.
-at_fn_check_skip ()
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
 {
   case $1 in
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$2: hard failure"; exit 99;;
     77) echo 77 > "$at_status_file"; exit 77;;
   esac
 }
 
-# at_fn_check_status EXPECTED EXIT-CODE LINE
-# ------------------------------------------
-# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
-# Otherwise, if it is 77 or 99, exit the test group subshell with that same
-# exit code; if it is anything else print an error message referring to LINE,
-# and fail the test.
-at_fn_check_status ()
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
 {
   case $2 in
     $1 ) ;;
     77) echo 77 > "$at_status_file"; exit 77;;
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$3: hard failure"; exit 99;;
     *) $as_echo "$3: exit code was $2, expected $1"
       at_failed=:;;
   esac
 }
 
-# at_fn_diff_devnull FILE
-# -----------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
-# invocations.
-at_fn_diff_devnull ()
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE.  Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
 {
   test -s "$1" || return 0
   $at_diff "$at_devnull" "$1"
 }
 
-# at_fn_test NUMBER
-# -----------------
+# at_func_test NUMBER
+# -------------------
 # Parse out test NUMBER from the tail of this file.
-at_fn_test ()
+at_func_test ()
 {
   eval at_sed=\$at_sed$1
   sed "$at_sed" "$at_myself" > "$at_test_source"
 }
 
-# at_fn_create_debugging_script
-# -----------------------------
+# at_func_create_debugging_script
+# -------------------------------
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
-at_fn_create_debugging_script ()
+at_func_create_debugging_script ()
 {
   {
     echo "#! /bin/sh" &&
@@ -1597,13 +1555,34 @@ at_fn_create_debugging_script ()
   chmod +x "$at_group_dir/run"
 }
 
-## -------------------------------- ##
-## End of autotest shell functions. ##
-## -------------------------------- ##
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.  The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  # With "$@", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $* ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "$@"`
+  }
+fi
+
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
 {
-  $as_echo "## ---------------- ##
+  cat <<\_ASBOX
+## ---------------- ##
 ## Tested programs. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1611,35 +1590,34 @@ at_fn_create_debugging_script ()
 for at_program in : $at_tested
 do
   test "$at_program" = : && continue
-  case $at_program in
-    [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
-    * )
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -f "$as_dir/$at_program" && break
-  done
+  test -f "$as_dir/$at_program" && break
+done
 IFS=$as_save_IFS
 
-    at_program_=$as_dir/$at_program ;;
-  esac
-  if test -f "$at_program_"; then
+  if test -f "$as_dir/$at_program"; then
     {
-      $as_echo "$at_srcdir/DMRTest.at:3: $at_program_ --version"
-      "$at_program_" --version </dev/null
+      $as_echo "$at_srcdir/DMRTest.at:3: $as_dir/$at_program --version"
+      "$as_dir/$at_program" --version </dev/null
       echo
     } >&5 2>&1
   else
-    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 done
 
 {
-  $as_echo "## ------------------ ##
+  cat <<\_ASBOX
+## ------------------ ##
 ## Running the tests. ##
-## ------------------ ##"
+## ------------------ ##
+_ASBOX
 } >&5
 
 at_start_date=`date`
@@ -1647,8 +1625,11 @@ at_start_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: starting at: $at_start_date" >&5
 
 # Create the master directory if it doesn't already exist.
-as_dir="$at_suite_dir"; as_fn_mkdir_p ||
-  as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
+test -d "$at_suite_dir" ||
+  mkdir "$at_suite_dir" ||
+  { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
 if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1682,40 +1663,28 @@ BEGIN { FS="" }
   if (test == "'"$at_group"'") exit
 }' "$at_myself" > "$at_suite_dir/at-source-lines" &&
 . "$at_suite_dir/at-source-lines" ||
-  as_fn_error $? "cannot create test line number cache" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+   { (exit 1); exit 1; }; }
 rm -f "$at_suite_dir/at-source-lines"
 
-# Set number of jobs for `-j'; avoid more jobs than test groups.
-set X $at_groups; shift; at_max_jobs=$#
-if test $at_max_jobs -eq 0; then
-  at_jobs=1
-fi
-if test $at_jobs -ne 1 &&
-   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
-  at_jobs=$at_max_jobs
-fi
-
-# If parallel mode, don't output banners, don't split summary lines.
-if test $at_jobs -ne 1; then
-  at_print_banners=false
-  at_quiet=:
-fi
-
 # Set up helper dirs.
 rm -rf "$at_helper_dir" &&
 mkdir "$at_helper_dir" &&
 cd "$at_helper_dir" &&
 { test -z "$at_groups" || mkdir $at_groups; } ||
-as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Functions for running a test group.  We leave the actual
 # test group execution outside of a shell function in order
 # to avoid hitting zsh 4.x exit status bugs.
 
-# at_fn_group_prepare
-# -------------------
-# Prepare for running a test group.
-at_fn_group_prepare ()
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
 {
   # The directory for additional per-group helper files.
   at_job_dir=$at_helper_dir/$at_group
@@ -1749,20 +1718,56 @@ at_fn_group_prepare ()
 
 
   # Create a fresh directory for the next test group, and enter.
-  # If one already exists, the user may have invoked ./run from
-  # within that directory; we remove the contents, but not the
-  # directory itself, so that we aren't pulling the rug out from
-  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
-  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
-  rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
-fi ||
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+    find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+    rm -fr "$at_group_dir" ||
+    { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+  fi
   # Be tolerant if the above `rm' was not able to remove the directory.
-  as_dir="$at_group_dir"; as_fn_mkdir_p
+  { as_dir="$at_group_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
   echo 0 > "$at_status_file"
 
@@ -1775,29 +1780,9 @@ $as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be
   fi
 }
 
-# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
-# -------------------------------------------------
-# Declare the test group ORDINAL, located at LINE with group description DESC,
-# and residing under BANNER. Use PAD to align the status column.
-at_fn_group_banner ()
-{
-  at_setup_line="$2"
-  test -n "$5" && at_fn_banner $5
-  at_desc="$3"
-  case $1 in
-    [0-9])      at_desc_line="  $1: ";;
-    [0-9][0-9]) at_desc_line=" $1: " ;;
-    *)          at_desc_line="$1: "  ;;
-  esac
-  as_fn_append at_desc_line "$3$4"
-  $at_quiet $as_echo_n "$at_desc_line"
-  echo "#                             -*- compilation -*-" >> "$at_group_log"
-}
-
-# at_fn_group_postprocess
-# -----------------------
-# Perform cleanup after running a test group.
-at_fn_group_postprocess ()
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
 {
   # Be sure to come back to the suite directory, in particular
   # since below we might `rm' the group directory we are in currently.
@@ -1810,7 +1795,6 @@ at_fn_group_postprocess ()
       report this failure to <opendap-tech at opendap.org>.
 _ATEOF
     $as_echo "$at_setup_line" >"$at_check_line_file"
-    at_status=99
   fi
   $at_verbose $as_echo_n "$at_group. $at_setup_line: "
   $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1819,41 +1803,31 @@ _ATEOF
 	at_msg="UNEXPECTED PASS"
 	at_res=xpass
 	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     no:0)
 	at_msg="ok"
 	at_res=pass
 	at_errexit=false
-	at_color=$at_grn
 	;;
     *:77)
 	at_msg='skipped ('`cat "$at_check_line_file"`')'
 	at_res=skip
 	at_errexit=false
-	at_color=$at_blu
-	;;
-    no:* | *:99)
-	at_msg='FAILED ('`cat "$at_check_line_file"`')'
-	at_res=fail
-	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     yes:*)
 	at_msg='expected failure ('`cat "$at_check_line_file"`')'
 	at_res=xfail
 	at_errexit=false
-	at_color=$at_lgn
+	;;
+    no:*)
+	at_msg='FAILED ('`cat "$at_check_line_file"`')'
+	at_res=fail
+	at_errexit=$at_errexit_p
 	;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
-  # In parallel mode, output the summary line only afterwards.
-  if test $at_jobs -ne 1 && test -n "$at_verbose"; then
-    $as_echo "$at_desc_line $at_color$at_msg$at_std"
-  else
-    # Make sure there is a separator even with long titles.
-    $as_echo " $at_color$at_msg$at_std"
-  fi
+  # Make sure there is a separator even with long titles.
+  $as_echo " $at_msg"
   at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
   case $at_status in
     0|77)
@@ -1868,13 +1842,9 @@ _ATEOF
       $as_echo "$at_log_msg" >> "$at_group_log"
       $as_echo "$at_log_msg" >&5
 
-      # Cleanup the group directory, unless the user wants the files
-      # or the success was unexpected.
-      if $at_debug_p || test $at_res = xpass; then
-	at_fn_create_debugging_script
-	if test $at_res = xpass && $at_errexit; then
-	  echo stop > "$at_stop_file"
-	fi
+      # Cleanup the group directory, unless the user wants the files.
+      if $at_debug_p; then
+	at_func_create_debugging_script
       else
 	if test -d "$at_group_dir"; then
 	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1891,7 +1861,7 @@ _ATEOF
 
       # Upon failure, keep the group directory for autopsy, and create
       # the debugging script.  With -e, do not start any further tests.
-      at_fn_create_debugging_script
+      at_func_create_debugging_script
       if $at_errexit; then
 	echo stop > "$at_stop_file"
       fi
@@ -1904,134 +1874,22 @@ _ATEOF
 ## Driver loop. ##
 ## ------------ ##
 
-
-if (set -m && set +m && set +b) >/dev/null 2>&1; then
-  set +b
-  at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
-else
-  at_job_control_on=: at_job_control_off=: at_job_group=
-fi
-
-for at_signal in 1 2 15; do
-  trap 'set +x; set +e
-	$at_job_control_off
-	at_signal='"$at_signal"'
-	echo stop > "$at_stop_file"
-	trap "" $at_signal
-	at_pgids=
-	for at_pgid in `jobs -p 2>/dev/null`; do
-	  at_pgids="$at_pgids $at_job_group$at_pgid"
-	done
-	test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
-	wait
-	if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
-	  echo >&2
-	fi
-	at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
-	set x $at_signame
-	test 1 -gt 2 && at_signame=$at_signal
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
-$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
-	as_fn_arith 128 + $at_signal && exit_status=$as_val
-	as_fn_exit $exit_status' $at_signal
-done
-
 rm -f "$at_stop_file"
 at_first=:
 
-if test $at_jobs -ne 1 &&
-     rm -f "$at_job_fifo" &&
-     test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
-then
-  # FIFO job dispatcher.
-
-  trap 'at_pids=
-	for at_pid in `jobs -p`; do
-	  at_pids="$at_pids $at_job_group$at_pid"
-	done
-	if test -n "$at_pids"; then
-	  at_sig=TSTP
-	  test "${TMOUT+set}" = set && at_sig=STOP
-	  kill -$at_sig $at_pids 2>/dev/null
-	fi
-	kill -STOP $$
-	test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
-
-  echo
-  # Turn jobs into a list of numbers, starting from 1.
-  at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
-  set X $at_joblist
-  shift
-  for at_group in $at_groups; do
-    $at_job_control_on 2>/dev/null
-    (
-      # Start one test group.
-      $at_job_control_off
-      if $at_first; then
-	exec 7>"$at_job_fifo"
-      else
-	exec 6<&-
-      fi
-      trap 'set +x; set +e
-	    trap "" PIPE
-	    echo stop > "$at_stop_file"
-	    echo >&7
-	    as_fn_exit 141' PIPE
-      at_fn_group_prepare
-      if cd "$at_group_dir" &&
-	 at_fn_test $at_group &&
-	 . "$at_test_source"
-      then :; else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+for at_group in $at_groups; do
+  at_func_group_prepare
+  if cd "$at_group_dir" &&
+     at_func_test $at_group &&
+     . "$at_test_source"; then :; else
+    { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
 $as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-	at_failed=:
-      fi
-      at_fn_group_postprocess
-      echo >&7
-    ) &
-    $at_job_control_off
-    if $at_first; then
-      at_first=false
-      exec 6<"$at_job_fifo" 7>"$at_job_fifo"
-    fi
-    shift # Consume one token.
-    if test $# -gt 0; then :; else
-      read at_token <&6 || break
-      set x $*
-    fi
-    test -f "$at_stop_file" && break
-  done
-  exec 7>&-
-  # Read back the remaining ($at_jobs - 1) tokens.
-  set X $at_joblist
-  shift
-  if test $# -gt 0; then
-    shift
-    for at_job
-    do
-      read at_token
-    done <&6
+    at_failed=:
   fi
-  exec 6<&-
-  wait
-else
-  # Run serially, avoid forks and other potential surprises.
-  for at_group in $at_groups; do
-    at_fn_group_prepare
-    if cd "$at_group_dir" &&
-       at_fn_test $at_group &&
-       . "$at_test_source"; then :; else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
-$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-      at_failed=:
-    fi
-    at_fn_group_postprocess
-    test -f "$at_stop_file" && break
-    at_first=false
-  done
-fi
+  at_func_group_postprocess
+  test -f "$at_stop_file" && break
+  at_first=false
+done
 
 # Wrap up the test suite with summary statistics.
 cd "$at_helper_dir"
@@ -2052,9 +1910,12 @@ set X $at_xfail_list; shift; at_xfail_count=$#
 set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
 set X $at_skip_list; shift; at_skip_count=$#
 
-as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
-as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
-as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 # Back to the top directory.
 cd "$at_dir"
@@ -2066,26 +1927,35 @@ at_stop_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: ending at: $at_stop_date" >&5
 case $at_start_time,$at_stop_time in
   [0-9]*,[0-9]*)
-    as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
-    as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
-    as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
-    as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
-    as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     $as_echo "$as_me: test suite duration: $at_duration" >&5
     ;;
 esac
 
 echo
-$as_echo "## ------------- ##
+cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
 echo
 {
   echo
-  $as_echo "## ------------- ##
+  cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -2103,14 +1973,12 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
     at_result="$at_result $at_were run, one failed"
   fi
   at_result="$at_result unexpectedly and inhibited subsequent tests."
-  at_color=$at_red
 else
   # Don't you just love exponential explosion of the number of cases?
-  at_color=$at_red
   case $at_xpass_count:$at_fail_count:$at_xfail_count in
     # So far, so good.
-    0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
-    0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
+    0:0:0) at_result="$at_result $at_were successful." ;;
+    0:0:*) at_result="$at_result behaved as expected." ;;
 
     # Some unexpected failures
     0:*:0) at_result="$at_result $at_were run,
@@ -2156,16 +2024,18 @@ $at_skip_count tests were skipped." ;;
 esac
 
 if test $at_unexpected_count = 0; then
-  echo "$at_color$at_result$at_std"
+  echo "$at_result"
   echo "$at_result" >&5
 else
-  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&5
   {
     echo
-    $as_echo "## ------------------------ ##
+    cat <<\_ASBOX
+## ------------------------ ##
 ## Summary of the failures. ##
-## ------------------------ ##"
+## ------------------------ ##
+_ASBOX
 
     # Summary of failed and skipped tests.
     if test $at_fail_count != 0; then
@@ -2184,9 +2054,11 @@ else
       echo
     fi
     if test $at_fail_count != 0; then
-      $as_echo "## ---------------------- ##
+      cat <<\_ASBOX
+## ---------------------- ##
 ## Detailed failed tests. ##
-## ---------------------- ##"
+## ---------------------- ##
+_ASBOX
       echo
       for at_group in $at_fail_list
       do
@@ -2218,21 +2090,19 @@ _ASBOX
 _ASBOX
 
   echo
-  if $at_debug_p; then
-    at_msg='per-test log files'
-  else
-    at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
-  fi
-  $as_echo "Please send $at_msg and all information you think might help:
+  $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
 
    To: <opendap-tech at opendap.org>
-   Subject: [libdap 3.18.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point.  Its output may
-be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
+   Subject: [libdap 3.18.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 "
-  exit 1
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.  Its output may'
+    $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+    echo
+  fi
+    exit 1
 fi
 
 exit 0
@@ -2241,12 +2111,15 @@ exit 0
 ## Actual tests. ##
 ## ------------- ##
 #AT_START_1
-at_fn_group_banner 1 'DMRTest.at:211' \
-  "parse dmr-testsuite/test_simple_1.xml" "          "
+# 1. DMRTest.at:211: parse dmr-testsuite/test_simple_1.xml
+at_setup_line='DMRTest.at:211'
+at_desc="parse dmr-testsuite/test_simple_1.xml"
+$at_quiet $as_echo_n "  1: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $as_echo "1. DMRTest.at:211: testing ..."
   $at_traceon
 
 
@@ -2254,79 +2127,111 @@ at_xfail=no
     input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:211"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:211 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:211: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:211"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-$at_failed && at_fn_log_failure
+echo DMRTest.at:211 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:211: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:211"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DMRTest.at:211 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:211: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:211"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:211 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:211"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_1
 #AT_START_2
-at_fn_group_banner 2 'DMRTest.at:212' \
-  "parse dmr-testsuite/test_simple_2.xml" "          "
+# 2. DMRTest.at:212: parse dmr-testsuite/test_simple_2.xml
+at_setup_line='DMRTest.at:212'
+at_desc="parse dmr-testsuite/test_simple_2.xml"
+$at_quiet $as_echo_n "  2: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $as_echo "2. DMRTest.at:212: testing ..."
   $at_traceon
 
 
@@ -2334,79 +2239,111 @@ at_xfail=no
     input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:212"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:212 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:212: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:212"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-$at_failed && at_fn_log_failure
+echo DMRTest.at:212 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:212: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:212"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DMRTest.at:212 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:212: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:212"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:212 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:212"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_2
 #AT_START_3
-at_fn_group_banner 3 'DMRTest.at:213' \
-  "parse dmr-testsuite/test_simple_3.xml" "          "
+# 3. DMRTest.at:213: parse dmr-testsuite/test_simple_3.xml
+at_setup_line='DMRTest.at:213'
+at_desc="parse dmr-testsuite/test_simple_3.xml"
+$at_quiet $as_echo_n "  3: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $as_echo "3. DMRTest.at:213: testing ..."
   $at_traceon
 
 
@@ -2414,79 +2351,111 @@ at_xfail=no
     input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:213"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:213 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:213: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:213"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-$at_failed && at_fn_log_failure
+echo DMRTest.at:213 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:213: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:213"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DMRTest.at:213 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:213: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:213"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:213 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:213"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_3
 #AT_START_4
-at_fn_group_banner 4 'DMRTest.at:215' \
-  "parse dmr-testsuite/test_simple_3_error_1.xml" "  "
+# 4. DMRTest.at:215: parse dmr-testsuite/test_simple_3_error_1.xml
+at_setup_line='DMRTest.at:215'
+at_desc="parse dmr-testsuite/test_simple_3_error_1.xml"
+$at_quiet $as_echo_n "  4: $at_desc  "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $as_echo "4. DMRTest.at:215: testing ..."
   $at_traceon
 
 
@@ -2494,79 +2463,111 @@ at_xfail=no
     input=$abs_srcdir/dmr-testsuite/test_simple_3_error_1.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:215"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:215 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:215: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:215"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-$at_failed && at_fn_log_failure
+echo DMRTest.at:215 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:215: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:215"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo DMRTest.at:215 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:215: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:215"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
-$at_failed && at_fn_log_failure
+echo DMRTest.at:215 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:215"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_4
 #AT_START_5
-at_fn_group_banner 5 'DMRTest.at:216' \
-  "parse dmr-testsuite/test_simple_3_error_2.xml" "  "
+# 5. DMRTest.at:216: parse dmr-testsuite/test_simple_3_error_2.xml
+at_setup_line='DMRTest.at:216'
+at_desc="parse dmr-testsuite/test_simple_3_error_2.xml"
+$at_quiet $as_echo_n "  5: $at_desc  "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $as_echo "5. DMRTest.at:216: testing ..."
   $at_traceon
 
 
@@ -2574,1599 +2575,3537 @@ at_xfail=no
     input=$abs_srcdir/dmr-testsuite/test_simple_3_error_2.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:216 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:216: mv stdout \$baseline.tmp"
+echo DMRTest.at:216 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:216"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo DMRTest.at:216 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:216: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:216 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_5
+#AT_START_6
+# 6. DMRTest.at:217: parse dmr-testsuite/test_simple_3_error_3.xml
+at_setup_line='DMRTest.at:217'
+at_desc="parse dmr-testsuite/test_simple_3_error_3.xml"
+$at_quiet $as_echo_n "  6: $at_desc  "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "6. DMRTest.at:217: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_3_error_3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:217 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:217: mv stdout \$baseline.tmp"
+echo DMRTest.at:217 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:217 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:217: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:217 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_6
+#AT_START_7
+# 7. DMRTest.at:219: parse dmr-testsuite/test_simple_4.xml
+at_setup_line='DMRTest.at:219'
+at_desc="parse dmr-testsuite/test_simple_4.xml"
+$at_quiet $as_echo_n "  7: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "7. DMRTest.at:219: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:219 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:219: mv stdout \$baseline.tmp"
+echo DMRTest.at:219 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:219 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:219: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:219 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_7
+#AT_START_8
+# 8. DMRTest.at:220: parse dmr-testsuite/test_simple_5.xml
+at_setup_line='DMRTest.at:220'
+at_desc="parse dmr-testsuite/test_simple_5.xml"
+$at_quiet $as_echo_n "  8: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "8. DMRTest.at:220: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:220 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:220: mv stdout \$baseline.tmp"
+echo DMRTest.at:220 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:220 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:220: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:220 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_8
+#AT_START_9
+# 9. DMRTest.at:221: parse dmr-testsuite/test_simple_6.xml
+at_setup_line='DMRTest.at:221'
+at_desc="parse dmr-testsuite/test_simple_6.xml"
+$at_quiet $as_echo_n "  9: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "9. DMRTest.at:221: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:221 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:221: mv stdout \$baseline.tmp"
+echo DMRTest.at:221 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:221 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:221: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:221 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:216: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:216"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-$at_failed && at_fn_log_failure
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_9
+#AT_START_10
+# 10. DMRTest.at:222: parse dmr-testsuite/test_simple_7.xml
+at_setup_line='DMRTest.at:222'
+at_desc="parse dmr-testsuite/test_simple_7.xml"
+$at_quiet $as_echo_n " 10: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "10. DMRTest.at:222: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:222 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:222: mv stdout \$baseline.tmp"
+echo DMRTest.at:222 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:222 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:222: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:222 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_10
+#AT_START_11
+# 11. DMRTest.at:223: parse dmr-testsuite/test_simple_8.xml
+at_setup_line='DMRTest.at:223'
+at_desc="parse dmr-testsuite/test_simple_8.xml"
+$at_quiet $as_echo_n " 11: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "11. DMRTest.at:223: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:223 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:223: mv stdout \$baseline.tmp"
+echo DMRTest.at:223 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:223 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:223: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:223 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_11
+#AT_START_12
+# 12. DMRTest.at:224: parse dmr-testsuite/test_simple_9.xml
+at_setup_line='DMRTest.at:224'
+at_desc="parse dmr-testsuite/test_simple_9.xml"
+$at_quiet $as_echo_n " 12: $at_desc          "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "12. DMRTest.at:224: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:224 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:224: mv stdout \$baseline.tmp"
+echo DMRTest.at:224 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:224 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:224: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:224 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_12
+#AT_START_13
+# 13. DMRTest.at:225: parse dmr-testsuite/test_simple_9.1.xml
+at_setup_line='DMRTest.at:225'
+at_desc="parse dmr-testsuite/test_simple_9.1.xml"
+$at_quiet $as_echo_n " 13: $at_desc        "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "13. DMRTest.at:225: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:225 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:225: mv stdout \$baseline.tmp"
+echo DMRTest.at:225 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:225 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:225: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:225 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_13
+#AT_START_14
+# 14. DMRTest.at:226: parse dmr-testsuite/test_simple_10.xml
+at_setup_line='DMRTest.at:226'
+at_desc="parse dmr-testsuite/test_simple_10.xml"
+$at_quiet $as_echo_n " 14: $at_desc         "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "14. DMRTest.at:226: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:226 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:226: mv stdout \$baseline.tmp"
+echo DMRTest.at:226 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:226 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:226: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:226 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_14
+#AT_START_15
+# 15. DMRTest.at:228: parse dmr-testsuite/test_array_1.xml
+at_setup_line='DMRTest.at:228'
+at_desc="parse dmr-testsuite/test_array_1.xml"
+$at_quiet $as_echo_n " 15: $at_desc           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "15. DMRTest.at:228: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:228 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:228: mv stdout \$baseline.tmp"
+echo DMRTest.at:228 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:228 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:228: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:228 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_15
+#AT_START_16
+# 16. DMRTest.at:229: parse dmr-testsuite/test_array_2.xml
+at_setup_line='DMRTest.at:229'
+at_desc="parse dmr-testsuite/test_array_2.xml"
+$at_quiet $as_echo_n " 16: $at_desc           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "16. DMRTest.at:229: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:229 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:229: mv stdout \$baseline.tmp"
+echo DMRTest.at:229 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+else
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:229 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:229: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:229 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+
+
+fi
+
+
+      $at_traceoff
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_16
+#AT_START_17
+# 17. DMRTest.at:230: parse dmr-testsuite/test_array_3.xml
+at_setup_line='DMRTest.at:230'
+at_desc="parse dmr-testsuite/test_array_3.xml"
+$at_quiet $as_echo_n " 17: $at_desc           "
+at_xfail=no
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
+(
+  $as_echo "17. DMRTest.at:230: testing ..."
+  $at_traceon
+
+
+
+    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
+    baseline=$input.baseline
+
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:230 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+
+$at_failed && at_func_log_failure
+$at_traceon; }
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:230: mv stdout \$baseline.tmp"
+echo DMRTest.at:230 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:216: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:216"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:230 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:216: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:216"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:230: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:230 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:216"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_5
-#AT_START_6
-at_fn_group_banner 6 'DMRTest.at:217' \
-  "parse dmr-testsuite/test_simple_3_error_3.xml" "  "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_17
+#AT_START_18
+# 18. DMRTest.at:231: parse dmr-testsuite/test_array_4.xml
+at_setup_line='DMRTest.at:231'
+at_desc="parse dmr-testsuite/test_array_4.xml"
+$at_quiet $as_echo_n " 18: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $as_echo "18. DMRTest.at:231: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_3_error_3.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:217"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:231 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:217: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:217"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:231: mv stdout \$baseline.tmp"
+echo DMRTest.at:231 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:217: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:217"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:231 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:217: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:217"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:231: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:231 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:217"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_6
-#AT_START_7
-at_fn_group_banner 7 'DMRTest.at:219' \
-  "parse dmr-testsuite/test_simple_4.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_18
+#AT_START_19
+# 19. DMRTest.at:232: parse dmr-testsuite/test_array_5.xml
+at_setup_line='DMRTest.at:232'
+at_desc="parse dmr-testsuite/test_array_5.xml"
+$at_quiet $as_echo_n " 19: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $as_echo "19. DMRTest.at:232: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:219"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:232 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:219: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:219"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:232: mv stdout \$baseline.tmp"
+echo DMRTest.at:232 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:219: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:219"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:232 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:219: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:219"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:232: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:232 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:219"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_7
-#AT_START_8
-at_fn_group_banner 8 'DMRTest.at:220' \
-  "parse dmr-testsuite/test_simple_5.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_19
+#AT_START_20
+# 20. DMRTest.at:233: parse dmr-testsuite/test_array_6.xml
+at_setup_line='DMRTest.at:233'
+at_desc="parse dmr-testsuite/test_array_6.xml"
+$at_quiet $as_echo_n " 20: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $as_echo "20. DMRTest.at:233: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:220"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:233 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:220: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:220"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:233: mv stdout \$baseline.tmp"
+echo DMRTest.at:233 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:220: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:220"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:233 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:220: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:220"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:233: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:233 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:220"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_8
-#AT_START_9
-at_fn_group_banner 9 'DMRTest.at:221' \
-  "parse dmr-testsuite/test_simple_6.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_20
+#AT_START_21
+# 21. DMRTest.at:234: parse dmr-testsuite/test_array_7.xml
+at_setup_line='DMRTest.at:234'
+at_desc="parse dmr-testsuite/test_array_7.xml"
+$at_quiet $as_echo_n " 21: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $as_echo "21. DMRTest.at:234: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:221"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:234 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:221: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:221"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:234: mv stdout \$baseline.tmp"
+echo DMRTest.at:234 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:221: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:221"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:234 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:221: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:221"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:234: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:234 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:221"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_9
-#AT_START_10
-at_fn_group_banner 10 'DMRTest.at:222' \
-  "parse dmr-testsuite/test_simple_7.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_21
+#AT_START_22
+# 22. DMRTest.at:235: parse dmr-testsuite/test_array_8.xml
+at_setup_line='DMRTest.at:235'
+at_desc="parse dmr-testsuite/test_array_8.xml"
+$at_quiet $as_echo_n " 22: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $as_echo "22. DMRTest.at:235: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:222"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:235 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:222: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:222"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:235: mv stdout \$baseline.tmp"
+echo DMRTest.at:235 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:222: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:222"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:235 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:222: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:222"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:235: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:235 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:222"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_10
-#AT_START_11
-at_fn_group_banner 11 'DMRTest.at:223' \
-  "parse dmr-testsuite/test_simple_8.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_22
+#AT_START_23
+# 23. DMRTest.at:236: parse dmr-testsuite/test_array_10.xml
+at_setup_line='DMRTest.at:236'
+at_desc="parse dmr-testsuite/test_array_10.xml"
+$at_quiet $as_echo_n " 23: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $as_echo "23. DMRTest.at:236: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:223"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:236 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:223: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:223"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:236: mv stdout \$baseline.tmp"
+echo DMRTest.at:236 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:223: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:223"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:236 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:223: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:223"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:236: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:236 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:223"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_11
-#AT_START_12
-at_fn_group_banner 12 'DMRTest.at:224' \
-  "parse dmr-testsuite/test_simple_9.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_23
+#AT_START_24
+# 24. DMRTest.at:237: parse dmr-testsuite/test_array_11.xml
+at_setup_line='DMRTest.at:237'
+at_desc="parse dmr-testsuite/test_array_11.xml"
+$at_quiet $as_echo_n " 24: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $as_echo "24. DMRTest.at:237: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
+    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
     baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:224"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:237 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:224: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:224"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:237: mv stdout \$baseline.tmp"
+echo DMRTest.at:237 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:224: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:224"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:237 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:224: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:224"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:237: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:237 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:224"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_12
-#AT_START_13
-at_fn_group_banner 13 'DMRTest.at:225' \
-  "parse dmr-testsuite/test_simple_9.1.xml" "        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_24
+#AT_START_25
+# 25. DMRTest.at:247: trans test_simple_1.xml
+at_setup_line='DMRTest.at:247'
+at_desc="trans test_simple_1.xml"
+$at_quiet $as_echo_n " 25: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $as_echo "25. DMRTest.at:247: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:225"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:247 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:225: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:225"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:247: mv stdout \$baseline.tmp"
+echo DMRTest.at:247 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:225: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:225"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:247 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:225: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:225"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:247: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:247 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:225"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_13
-#AT_START_14
-at_fn_group_banner 14 'DMRTest.at:226' \
-  "parse dmr-testsuite/test_simple_10.xml" "         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_25
+#AT_START_26
+# 26. DMRTest.at:248: trans test_simple_2.xml
+at_setup_line='DMRTest.at:248'
+at_desc="trans test_simple_2.xml"
+$at_quiet $as_echo_n " 26: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $as_echo "26. DMRTest.at:248: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
-    baseline=$input.baseline
-
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:226"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:226: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:226"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    if test -n "$baselines" -a x$baselines = xyes; then
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:248 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
-
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:226: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:226"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:226: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:226"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:226"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:248: mv stdout \$baseline.tmp"
+echo DMRTest.at:248 >"$at_check_line_file"
 
-
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
 fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
 
-      set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_14
-#AT_START_15
-at_fn_group_banner 15 'DMRTest.at:228' \
-  "parse dmr-testsuite/test_array_1.xml" "           "
-at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
-(
-  $as_echo "15. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    baseline=$input.baseline
+else
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:248 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:228"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:228: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:228"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:248: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:248 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:228: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:228"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:228: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:228"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:228"
-$at_failed && at_fn_log_failure
-$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_15
-#AT_START_16
-at_fn_group_banner 16 'DMRTest.at:229' \
-  "parse dmr-testsuite/test_array_2.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_26
+#AT_START_27
+# 27. DMRTest.at:249: trans test_simple_3.xml
+at_setup_line='DMRTest.at:249'
+at_desc="trans test_simple_3.xml"
+$at_quiet $as_echo_n " 27: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $as_echo "27. DMRTest.at:249: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:229"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:249 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:229: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:229"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:249: mv stdout \$baseline.tmp"
+echo DMRTest.at:249 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:229: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:229"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:249 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:229: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:229"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:249: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:249 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:229"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_16
-#AT_START_17
-at_fn_group_banner 17 'DMRTest.at:230' \
-  "parse dmr-testsuite/test_array_3.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_27
+#AT_START_28
+# 28. DMRTest.at:250: trans test_simple_4.xml
+at_setup_line='DMRTest.at:250'
+at_desc="trans test_simple_4.xml"
+$at_quiet $as_echo_n " 28: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $as_echo "28. DMRTest.at:250: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:230"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:250 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:230: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:230"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:250: mv stdout \$baseline.tmp"
+echo DMRTest.at:250 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:230: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:230"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:250 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:230: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:230"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:250: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:250 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:230"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_17
-#AT_START_18
-at_fn_group_banner 18 'DMRTest.at:231' \
-  "parse dmr-testsuite/test_array_4.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_28
+#AT_START_29
+# 29. DMRTest.at:251: trans test_simple_5.xml
+at_setup_line='DMRTest.at:251'
+at_desc="trans test_simple_5.xml"
+$at_quiet $as_echo_n " 29: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $as_echo "29. DMRTest.at:251: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:231"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:251 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:231: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:231"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:251: mv stdout \$baseline.tmp"
+echo DMRTest.at:251 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:231: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:231"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:251 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:231: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:231"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:251: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:251 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:231"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_18
-#AT_START_19
-at_fn_group_banner 19 'DMRTest.at:232' \
-  "parse dmr-testsuite/test_array_5.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_29
+#AT_START_30
+# 30. DMRTest.at:252: trans test_simple_6.xml
+at_setup_line='DMRTest.at:252'
+at_desc="trans test_simple_6.xml"
+$at_quiet $as_echo_n " 30: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $as_echo "30. DMRTest.at:252: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:232"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:252 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:232: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:232"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:252: mv stdout \$baseline.tmp"
+echo DMRTest.at:252 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:232: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:232"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:252 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:232: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:232"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:252: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:252 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:232"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_19
-#AT_START_20
-at_fn_group_banner 20 'DMRTest.at:233' \
-  "parse dmr-testsuite/test_array_6.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_30
+#AT_START_31
+# 31. DMRTest.at:253: trans test_simple_7.xml
+at_setup_line='DMRTest.at:253'
+at_desc="trans test_simple_7.xml"
+$at_quiet $as_echo_n " 31: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $as_echo "31. DMRTest.at:253: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:233"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:253 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:233: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:233"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:253: mv stdout \$baseline.tmp"
+echo DMRTest.at:253 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:233: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:233"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:253 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:233: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:233"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:253: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:253 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:233"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_20
-#AT_START_21
-at_fn_group_banner 21 'DMRTest.at:234' \
-  "parse dmr-testsuite/test_array_7.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_31
+#AT_START_32
+# 32. DMRTest.at:254: trans test_simple_8.xml
+at_setup_line='DMRTest.at:254'
+at_desc="trans test_simple_8.xml"
+$at_quiet $as_echo_n " 32: $at_desc                        "
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "xfail" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $as_echo "32. DMRTest.at:254: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:234"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:254 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:234: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:234"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:254: mv stdout \$baseline.tmp"
+echo DMRTest.at:254 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:234: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:234"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:254 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:234: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:234"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:254: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:254 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:234"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_21
-#AT_START_22
-at_fn_group_banner 22 'DMRTest.at:235' \
-  "parse dmr-testsuite/test_array_8.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_32
+#AT_START_33
+# 33. DMRTest.at:255: trans test_simple_9.xml
+at_setup_line='DMRTest.at:255'
+at_desc="trans test_simple_9.xml"
+$at_quiet $as_echo_n " 33: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $as_echo "33. DMRTest.at:255: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:235"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:255 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:235: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:235"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:255: mv stdout \$baseline.tmp"
+echo DMRTest.at:255 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:235: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:235"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:255 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:235: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:235"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:255: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:255 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:235"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_22
-#AT_START_23
-at_fn_group_banner 23 'DMRTest.at:236' \
-  "parse dmr-testsuite/test_array_10.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_33
+#AT_START_34
+# 34. DMRTest.at:256: trans test_simple_9.1.xml
+at_setup_line='DMRTest.at:256'
+at_desc="trans test_simple_9.1.xml"
+$at_quiet $as_echo_n " 34: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $as_echo "34. DMRTest.at:256: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:236"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:256 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:236: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:236"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:256: mv stdout \$baseline.tmp"
+echo DMRTest.at:256 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:236: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:236"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:256 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:236: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:236"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:256: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:256 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:236"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_23
-#AT_START_24
-at_fn_group_banner 24 'DMRTest.at:237' \
-  "parse dmr-testsuite/test_array_11.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_34
+#AT_START_35
+# 35. DMRTest.at:257: trans test_simple_10.xml
+at_setup_line='DMRTest.at:257'
+at_desc="trans test_simple_10.xml"
+$at_quiet $as_echo_n " 35: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $as_echo "35. DMRTest.at:257: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
-    baseline=$input.baseline
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
+
+    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:237"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:257 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:237: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:237"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:257: mv stdout \$baseline.tmp"
+echo DMRTest.at:257 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:237: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:237"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:257 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:237: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:237"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:257: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:257 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:237"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
+
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_24
-#AT_START_25
-at_fn_group_banner 25 'DMRTest.at:247' \
-  "trans test_simple_1.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_35
+#AT_START_36
+# 36. DMRTest.at:259: trans test_array_1.xml
+at_setup_line='DMRTest.at:259'
+at_desc="trans test_array_1.xml"
+$at_quiet $as_echo_n " 36: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $as_echo "36. DMRTest.at:259: testing ..."
   $at_traceon
 
 
@@ -4176,64 +6115,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:247"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:259 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:247: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:247"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:259: mv stdout \$baseline.tmp"
+echo DMRTest.at:259 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:247: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:247"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:259 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:247: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:247"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:259: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:259 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:247"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4241,18 +6208,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_25
-#AT_START_26
-at_fn_group_banner 26 'DMRTest.at:248' \
-  "trans test_simple_2.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_36
+#AT_START_37
+# 37. DMRTest.at:260: trans test_array_2.xml
+at_setup_line='DMRTest.at:260'
+at_desc="trans test_array_2.xml"
+$at_quiet $as_echo_n " 37: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $as_echo "37. DMRTest.at:260: testing ..."
   $at_traceon
 
 
@@ -4262,64 +6233,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:248"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:260 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:248: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:248"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:260: mv stdout \$baseline.tmp"
+echo DMRTest.at:260 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:248: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:248"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:260 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:248: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:248"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:260: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:260 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:248"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4327,18 +6326,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_26
-#AT_START_27
-at_fn_group_banner 27 'DMRTest.at:249' \
-  "trans test_simple_3.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_37
+#AT_START_38
+# 38. DMRTest.at:261: trans test_array_3.xml
+at_setup_line='DMRTest.at:261'
+at_desc="trans test_array_3.xml"
+$at_quiet $as_echo_n " 38: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $as_echo "38. DMRTest.at:261: testing ..."
   $at_traceon
 
 
@@ -4348,64 +6351,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:261 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:249"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:249: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:249"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:261: mv stdout \$baseline.tmp"
+echo DMRTest.at:261 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:249: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:249"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:261 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:249: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:249"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:261: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:261 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:249"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4413,18 +6444,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_27
-#AT_START_28
-at_fn_group_banner 28 'DMRTest.at:250' \
-  "trans test_simple_4.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_38
+#AT_START_39
+# 39. DMRTest.at:262: trans test_array_4.xml
+at_setup_line='DMRTest.at:262'
+at_desc="trans test_array_4.xml"
+$at_quiet $as_echo_n " 39: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $as_echo "39. DMRTest.at:262: testing ..."
   $at_traceon
 
 
@@ -4434,64 +6469,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:250"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:262: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:262 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:250: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:250"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:262: mv stdout \$baseline.tmp"
+echo DMRTest.at:262 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:250: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:250"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:262: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:262 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:250: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:250"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:262: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:262 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:250"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4499,18 +6562,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_28
-#AT_START_29
-at_fn_group_banner 29 'DMRTest.at:251' \
-  "trans test_simple_5.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_39
+#AT_START_40
+# 40. DMRTest.at:263: trans test_array_5.xml
+at_setup_line='DMRTest.at:263'
+at_desc="trans test_array_5.xml"
+$at_quiet $as_echo_n " 40: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $as_echo "40. DMRTest.at:263: testing ..."
   $at_traceon
 
 
@@ -4520,64 +6587,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:251"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:263 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:251: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:251"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:263: mv stdout \$baseline.tmp"
+echo DMRTest.at:263 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:251: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:251"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:263 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:251: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:251"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:263: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:263 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:251"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4585,18 +6680,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_29
-#AT_START_30
-at_fn_group_banner 30 'DMRTest.at:252' \
-  "trans test_simple_6.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_40
+#AT_START_41
+# 41. DMRTest.at:264: trans test_array_6.xml
+at_setup_line='DMRTest.at:264'
+at_desc="trans test_array_6.xml"
+$at_quiet $as_echo_n " 41: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $as_echo "41. DMRTest.at:264: testing ..."
   $at_traceon
 
 
@@ -4606,64 +6705,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:252"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:264 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:252: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:252"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:264: mv stdout \$baseline.tmp"
+echo DMRTest.at:264 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:252: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:252"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:264 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:252: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:252"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:264: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:264 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:252"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4671,18 +6798,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_30
-#AT_START_31
-at_fn_group_banner 31 'DMRTest.at:253' \
-  "trans test_simple_7.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_41
+#AT_START_42
+# 42. DMRTest.at:265: trans test_array_7.xml
+at_setup_line='DMRTest.at:265'
+at_desc="trans test_array_7.xml"
+$at_quiet $as_echo_n " 42: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $as_echo "42. DMRTest.at:265: testing ..."
   $at_traceon
 
 
@@ -4692,64 +6823,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:253"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:265 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:253: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:253"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:265: mv stdout \$baseline.tmp"
+echo DMRTest.at:265 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:253: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:253"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:265 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:253: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:253"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:265: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:265 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:253"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4757,18 +6916,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_31
-#AT_START_32
-at_fn_group_banner 32 'DMRTest.at:254' \
-  "trans test_simple_8.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_42
+#AT_START_43
+# 43. DMRTest.at:266: trans test_array_8.xml
+at_setup_line='DMRTest.at:266'
+at_desc="trans test_array_8.xml"
+$at_quiet $as_echo_n " 43: $at_desc                         "
 at_xfail=no
-      test "xfail" = "xfail" && at_xfail=yes
+      test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $as_echo "43. DMRTest.at:266: testing ..."
   $at_traceon
 
 
@@ -4778,64 +6941,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:254"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:266 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:254: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:254"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:266: mv stdout \$baseline.tmp"
+echo DMRTest.at:266 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:254: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:254"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:266 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:254: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:254"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:266: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:266 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:254"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4843,18 +7034,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_32
-#AT_START_33
-at_fn_group_banner 33 'DMRTest.at:255' \
-  "trans test_simple_9.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_43
+#AT_START_44
+# 44. DMRTest.at:267: trans test_array_10.xml
+at_setup_line='DMRTest.at:267'
+at_desc="trans test_array_10.xml"
+$at_quiet $as_echo_n " 44: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $as_echo "44. DMRTest.at:267: testing ..."
   $at_traceon
 
 
@@ -4864,64 +7059,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:255"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:267 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:255: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:255"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:267: mv stdout \$baseline.tmp"
+echo DMRTest.at:267 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:255: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:255"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:267 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:255: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:255"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:267: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:267 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:255"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -4929,18 +7152,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_33
-#AT_START_34
-at_fn_group_banner 34 'DMRTest.at:256' \
-  "trans test_simple_9.1.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_44
+#AT_START_45
+# 45. DMRTest.at:268: trans test_array_11.xml
+at_setup_line='DMRTest.at:268'
+at_desc="trans test_array_11.xml"
+$at_quiet $as_echo_n " 45: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $as_echo "45. DMRTest.at:268: testing ..."
   $at_traceon
 
 
@@ -4950,64 +7177,92 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:256"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:268 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:256: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:256"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:268: mv stdout \$baseline.tmp"
+echo DMRTest.at:268 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:256: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:256"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:268 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:256: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:256"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:268: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:268 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:256"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5015,18 +7270,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_34
-#AT_START_35
-at_fn_group_banner 35 'DMRTest.at:257' \
-  "trans test_simple_10.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_45
+#AT_START_46
+# 46. DMRTest.at:270: intern test_simple_1.xml
+at_setup_line='DMRTest.at:270'
+at_desc="intern test_simple_1.xml"
+$at_quiet $as_echo_n " 46: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $as_echo "46. DMRTest.at:270: testing ..."
   $at_traceon
 
 
@@ -5035,65 +7294,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:270 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:257"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:257: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:257"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:270: mv stdout \$baseline.tmp"
+echo DMRTest.at:270 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:257: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:257"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:270 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:257: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:257"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:270: diff -b -B \$baseline stdout"
+echo DMRTest.at:270 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:257"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5101,18 +7387,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_35
-#AT_START_36
-at_fn_group_banner 36 'DMRTest.at:259' \
-  "trans test_array_1.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_46
+#AT_START_47
+# 47. DMRTest.at:271: intern test_simple_2.xml
+at_setup_line='DMRTest.at:271'
+at_desc="intern test_simple_2.xml"
+$at_quiet $as_echo_n " 47: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $as_echo "47. DMRTest.at:271: testing ..."
   $at_traceon
 
 
@@ -5121,65 +7411,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:271 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:259"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:259: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:259"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:271: mv stdout \$baseline.tmp"
+echo DMRTest.at:271 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:259: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:259"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:271 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:259: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:259"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:271: diff -b -B \$baseline stdout"
+echo DMRTest.at:271 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:259"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5187,18 +7504,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_36
-#AT_START_37
-at_fn_group_banner 37 'DMRTest.at:260' \
-  "trans test_array_2.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_47
+#AT_START_48
+# 48. DMRTest.at:272: intern test_simple_3.xml
+at_setup_line='DMRTest.at:272'
+at_desc="intern test_simple_3.xml"
+$at_quiet $as_echo_n " 48: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $as_echo "48. DMRTest.at:272: testing ..."
   $at_traceon
 
 
@@ -5207,65 +7528,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:272 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:260"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:260: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:260"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:272: mv stdout \$baseline.tmp"
+echo DMRTest.at:272 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:260: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:260"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:272 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:260: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:260"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:272: diff -b -B \$baseline stdout"
+echo DMRTest.at:272 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:260"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5273,18 +7621,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_37
-#AT_START_38
-at_fn_group_banner 38 'DMRTest.at:261' \
-  "trans test_array_3.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_48
+#AT_START_49
+# 49. DMRTest.at:273: intern test_simple_4.xml
+at_setup_line='DMRTest.at:273'
+at_desc="intern test_simple_4.xml"
+$at_quiet $as_echo_n " 49: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $as_echo "49. DMRTest.at:273: testing ..."
   $at_traceon
 
 
@@ -5293,65 +7645,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:273 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:261"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:261: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:261"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:273: mv stdout \$baseline.tmp"
+echo DMRTest.at:273 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:261: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:261"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:273 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:261: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:261"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:273: diff -b -B \$baseline stdout"
+echo DMRTest.at:273 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:261"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5359,18 +7738,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_38
-#AT_START_39
-at_fn_group_banner 39 'DMRTest.at:262' \
-  "trans test_array_4.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_49
+#AT_START_50
+# 50. DMRTest.at:274: intern test_simple_5.xml
+at_setup_line='DMRTest.at:274'
+at_desc="intern test_simple_5.xml"
+$at_quiet $as_echo_n " 50: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $as_echo "50. DMRTest.at:274: testing ..."
   $at_traceon
 
 
@@ -5379,65 +7762,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:274 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:262: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:262"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:262: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:262"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:274: mv stdout \$baseline.tmp"
+echo DMRTest.at:274 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:262: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:262"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:274 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:262: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:262"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:274: diff -b -B \$baseline stdout"
+echo DMRTest.at:274 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:262"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5445,18 +7855,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_39
-#AT_START_40
-at_fn_group_banner 40 'DMRTest.at:263' \
-  "trans test_array_5.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_50
+#AT_START_51
+# 51. DMRTest.at:275: intern test_simple_6.xml
+at_setup_line='DMRTest.at:275'
+at_desc="intern test_simple_6.xml"
+$at_quiet $as_echo_n " 51: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $as_echo "51. DMRTest.at:275: testing ..."
   $at_traceon
 
 
@@ -5465,65 +7879,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:275 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:263"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:263: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:263"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:275: mv stdout \$baseline.tmp"
+echo DMRTest.at:275 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:263: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:263"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:275 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:263: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:263"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:275: diff -b -B \$baseline stdout"
+echo DMRTest.at:275 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:263"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5531,18 +7972,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_40
-#AT_START_41
-at_fn_group_banner 41 'DMRTest.at:264' \
-  "trans test_array_6.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_51
+#AT_START_52
+# 52. DMRTest.at:276: intern test_simple_7.xml
+at_setup_line='DMRTest.at:276'
+at_desc="intern test_simple_7.xml"
+$at_quiet $as_echo_n " 52: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "41. $at_setup_line: testing $at_desc ..."
+  $as_echo "52. DMRTest.at:276: testing ..."
   $at_traceon
 
 
@@ -5551,65 +7996,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:276 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:264"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:264: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:264"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:276: mv stdout \$baseline.tmp"
+echo DMRTest.at:276 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:264: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:264"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:276 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:264: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:264"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:276: diff -b -B \$baseline stdout"
+echo DMRTest.at:276 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:264"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5617,18 +8089,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_41
-#AT_START_42
-at_fn_group_banner 42 'DMRTest.at:265' \
-  "trans test_array_7.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_52
+#AT_START_53
+# 53. DMRTest.at:277: intern test_simple_8.xml
+at_setup_line='DMRTest.at:277'
+at_desc="intern test_simple_8.xml"
+$at_quiet $as_echo_n " 53: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "42. $at_setup_line: testing $at_desc ..."
+  $as_echo "53. DMRTest.at:277: testing ..."
   $at_traceon
 
 
@@ -5637,65 +8113,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:277 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:265"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:265: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:265"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:277: mv stdout \$baseline.tmp"
+echo DMRTest.at:277 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:265: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:265"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:277 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:265: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:265"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:277: diff -b -B \$baseline stdout"
+echo DMRTest.at:277 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:265"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5703,18 +8206,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_42
-#AT_START_43
-at_fn_group_banner 43 'DMRTest.at:266' \
-  "trans test_array_8.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_53
+#AT_START_54
+# 54. DMRTest.at:278: intern test_simple_9.xml
+at_setup_line='DMRTest.at:278'
+at_desc="intern test_simple_9.xml"
+$at_quiet $as_echo_n " 54: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "43. $at_setup_line: testing $at_desc ..."
+  $as_echo "54. DMRTest.at:278: testing ..."
   $at_traceon
 
 
@@ -5723,65 +8230,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:278 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:266"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:266: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:266"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:278: mv stdout \$baseline.tmp"
+echo DMRTest.at:278 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:266: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:266"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:278 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:266: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:266"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:278: diff -b -B \$baseline stdout"
+echo DMRTest.at:278 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:266"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5789,18 +8323,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_43
-#AT_START_44
-at_fn_group_banner 44 'DMRTest.at:267' \
-  "trans test_array_10.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_54
+#AT_START_55
+# 55. DMRTest.at:279: intern test_simple_9.1.xml
+at_setup_line='DMRTest.at:279'
+at_desc="intern test_simple_9.1.xml"
+$at_quiet $as_echo_n " 55: $at_desc                     "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "44. $at_setup_line: testing $at_desc ..."
+  $as_echo "55. DMRTest.at:279: testing ..."
   $at_traceon
 
 
@@ -5809,65 +8347,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:279 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:267"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:267: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:267"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:279: mv stdout \$baseline.tmp"
+echo DMRTest.at:279 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:267: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:267"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:279 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:267: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:267"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:279: diff -b -B \$baseline stdout"
+echo DMRTest.at:279 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:267"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5875,18 +8440,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_44
-#AT_START_45
-at_fn_group_banner 45 'DMRTest.at:268' \
-  "trans test_array_11.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_55
+#AT_START_56
+# 56. DMRTest.at:280: intern test_simple_10.xml
+at_setup_line='DMRTest.at:280'
+at_desc="intern test_simple_10.xml"
+$at_quiet $as_echo_n " 56: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "45. $at_setup_line: testing $at_desc ..."
+  $as_echo "56. DMRTest.at:280: testing ..."
   $at_traceon
 
 
@@ -5895,65 +8464,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:280 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:268"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:268: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:268"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:280: mv stdout \$baseline.tmp"
+echo DMRTest.at:280 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:268: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:268"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:280 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:268: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:268"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:280: diff -b -B \$baseline stdout"
+echo DMRTest.at:280 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:268"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -5961,18 +8557,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_45
-#AT_START_46
-at_fn_group_banner 46 'DMRTest.at:270' \
-  "intern test_simple_1.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_56
+#AT_START_57
+# 57. DMRTest.at:282: intern test_array_1.xml
+at_setup_line='DMRTest.at:282'
+at_desc="intern test_array_1.xml"
+$at_quiet $as_echo_n " 57: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "46. $at_setup_line: testing $at_desc ..."
+  $as_echo "57. DMRTest.at:282: testing ..."
   $at_traceon
 
 
@@ -5981,64 +8581,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_1.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:270"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:282 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:270: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:270"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:282: mv stdout \$baseline.tmp"
+echo DMRTest.at:282 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:270: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:270"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:282 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:270: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:270"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:282: diff -b -B \$baseline stdout"
+echo DMRTest.at:282 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:270"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6046,18 +8674,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_46
-#AT_START_47
-at_fn_group_banner 47 'DMRTest.at:271' \
-  "intern test_simple_2.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_57
+#AT_START_58
+# 58. DMRTest.at:283: intern test_array_2.xml
+at_setup_line='DMRTest.at:283'
+at_desc="intern test_array_2.xml"
+$at_quiet $as_echo_n " 58: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "47. $at_setup_line: testing $at_desc ..."
+  $as_echo "58. DMRTest.at:283: testing ..."
   $at_traceon
 
 
@@ -6066,64 +8698,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_2.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:271"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:283 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:271: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:271"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:283: mv stdout \$baseline.tmp"
+echo DMRTest.at:283 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:271: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:271"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:283 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:271: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:271"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:283: diff -b -B \$baseline stdout"
+echo DMRTest.at:283 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:271"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6131,18 +8791,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_47
-#AT_START_48
-at_fn_group_banner 48 'DMRTest.at:272' \
-  "intern test_simple_3.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_58
+#AT_START_59
+# 59. DMRTest.at:284: intern test_array_3.xml
+at_setup_line='DMRTest.at:284'
+at_desc="intern test_array_3.xml"
+$at_quiet $as_echo_n " 59: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "48. $at_setup_line: testing $at_desc ..."
+  $as_echo "59. DMRTest.at:284: testing ..."
   $at_traceon
 
 
@@ -6151,64 +8815,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_3.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:272"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:284 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:272: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:272"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:284: mv stdout \$baseline.tmp"
+echo DMRTest.at:284 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:272: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:272"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:284 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:272: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:272"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:284: diff -b -B \$baseline stdout"
+echo DMRTest.at:284 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:272"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6216,18 +8908,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_48
-#AT_START_49
-at_fn_group_banner 49 'DMRTest.at:273' \
-  "intern test_simple_4.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_59
+#AT_START_60
+# 60. DMRTest.at:285: intern test_array_4.xml
+at_setup_line='DMRTest.at:285'
+at_desc="intern test_array_4.xml"
+$at_quiet $as_echo_n " 60: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "49. $at_setup_line: testing $at_desc ..."
+  $as_echo "60. DMRTest.at:285: testing ..."
   $at_traceon
 
 
@@ -6236,64 +8932,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_4.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:273"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:285 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:273: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:273"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:285: mv stdout \$baseline.tmp"
+echo DMRTest.at:285 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:273: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:273"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:285 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:273: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:273"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:285: diff -b -B \$baseline stdout"
+echo DMRTest.at:285 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:273"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6301,18 +9025,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_49
-#AT_START_50
-at_fn_group_banner 50 'DMRTest.at:274' \
-  "intern test_simple_5.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_60
+#AT_START_61
+# 61. DMRTest.at:286: intern test_array_5.xml
+at_setup_line='DMRTest.at:286'
+at_desc="intern test_array_5.xml"
+$at_quiet $as_echo_n " 61: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "50. $at_setup_line: testing $at_desc ..."
+  $as_echo "61. DMRTest.at:286: testing ..."
   $at_traceon
 
 
@@ -6321,64 +9049,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_5.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_5.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:274"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:286 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:274: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:274"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:286: mv stdout \$baseline.tmp"
+echo DMRTest.at:286 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:274: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:274"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:286 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:274: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:274"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:286: diff -b -B \$baseline stdout"
+echo DMRTest.at:286 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:274"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6386,18 +9142,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_50
-#AT_START_51
-at_fn_group_banner 51 'DMRTest.at:275' \
-  "intern test_simple_6.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_61
+#AT_START_62
+# 62. DMRTest.at:287: intern test_array_6.xml
+at_setup_line='DMRTest.at:287'
+at_desc="intern test_array_6.xml"
+$at_quiet $as_echo_n " 62: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "51. $at_setup_line: testing $at_desc ..."
+  $as_echo "62. DMRTest.at:287: testing ..."
   $at_traceon
 
 
@@ -6406,64 +9166,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:275"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:287 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:275: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:275"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:287: mv stdout \$baseline.tmp"
+echo DMRTest.at:287 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:275: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:275"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:287 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:275: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:275"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:287: diff -b -B \$baseline stdout"
+echo DMRTest.at:287 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:275"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6471,18 +9259,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_51
-#AT_START_52
-at_fn_group_banner 52 'DMRTest.at:276' \
-  "intern test_simple_7.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_62
+#AT_START_63
+# 63. DMRTest.at:288: intern test_array_7.xml
+at_setup_line='DMRTest.at:288'
+at_desc="intern test_array_7.xml"
+$at_quiet $as_echo_n " 63: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "52. $at_setup_line: testing $at_desc ..."
+  $as_echo "63. DMRTest.at:288: testing ..."
   $at_traceon
 
 
@@ -6491,64 +9283,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:276"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:288 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:276: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:276"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:288: mv stdout \$baseline.tmp"
+echo DMRTest.at:288 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:276: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:276"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:288 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:276: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:276"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:288: diff -b -B \$baseline stdout"
+echo DMRTest.at:288 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:276"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6556,18 +9376,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_52
-#AT_START_53
-at_fn_group_banner 53 'DMRTest.at:277' \
-  "intern test_simple_8.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_63
+#AT_START_64
+# 64. DMRTest.at:289: intern test_array_8.xml
+at_setup_line='DMRTest.at:289'
+at_desc="intern test_array_8.xml"
+$at_quiet $as_echo_n " 64: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "53. $at_setup_line: testing $at_desc ..."
+  $as_echo "64. DMRTest.at:289: testing ..."
   $at_traceon
 
 
@@ -6576,64 +9400,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:277"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:289 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:277: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:277"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:289: mv stdout \$baseline.tmp"
+echo DMRTest.at:289 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:277: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:277"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:289 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:277: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:277"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:289: diff -b -B \$baseline stdout"
+echo DMRTest.at:289 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:277"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6641,18 +9493,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_53
-#AT_START_54
-at_fn_group_banner 54 'DMRTest.at:278' \
-  "intern test_simple_9.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_64
+#AT_START_65
+# 65. DMRTest.at:290: intern test_array_10.xml
+at_setup_line='DMRTest.at:290'
+at_desc="intern test_array_10.xml"
+$at_quiet $as_echo_n " 65: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "54. $at_setup_line: testing $at_desc ..."
+  $as_echo "65. DMRTest.at:290: testing ..."
   $at_traceon
 
 
@@ -6661,64 +9517,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:278"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:290 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:278: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:278"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:290: mv stdout \$baseline.tmp"
+echo DMRTest.at:290 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:278: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:278"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:290 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:278: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:278"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:290: diff -b -B \$baseline stdout"
+echo DMRTest.at:290 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:278"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6726,18 +9610,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_54
-#AT_START_55
-at_fn_group_banner 55 'DMRTest.at:279' \
-  "intern test_simple_9.1.xml" "                     "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_65
+#AT_START_66
+# 66. DMRTest.at:291: intern test_array_11.xml
+at_setup_line='DMRTest.at:291'
+at_desc="intern test_array_11.xml"
+$at_quiet $as_echo_n " 66: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "55. $at_setup_line: testing $at_desc ..."
+  $as_echo "66. DMRTest.at:291: testing ..."
   $at_traceon
 
 
@@ -6746,64 +9634,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_9.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_9.1.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:279"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:291 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:279: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:279"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:291: mv stdout \$baseline.tmp"
+echo DMRTest.at:291 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:279: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:279"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:291 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:279: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:279"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:291: diff -b -B \$baseline stdout"
+echo DMRTest.at:291 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:279"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -6811,528 +9727,694 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_55
-#AT_START_56
-at_fn_group_banner 56 'DMRTest.at:280' \
-  "intern test_simple_10.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_66
+#AT_START_67
+# 67. DMRTest.at:294: parse dmr-testsuite/test_array_9.xml
+at_setup_line='DMRTest.at:294'
+at_desc="parse dmr-testsuite/test_array_9.xml"
+$at_quiet $as_echo_n " 67: $at_desc           "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "56. $at_setup_line: testing $at_desc ..."
+  $as_echo "67. DMRTest.at:294: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_10.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_10.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:280"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:294 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:280: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:280"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:294: mv stdout \$baseline.tmp"
+echo DMRTest.at:294 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:280: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:280"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:294 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:280: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:280"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:294 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:280"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_56
-#AT_START_57
-at_fn_group_banner 57 'DMRTest.at:282' \
-  "intern test_array_1.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_67
+#AT_START_68
+# 68. DMRTest.at:295: parse dmr-testsuite/test_array_12.xml
+at_setup_line='DMRTest.at:295'
+at_desc="parse dmr-testsuite/test_array_12.xml"
+$at_quiet $as_echo_n " 68: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "57. $at_setup_line: testing $at_desc ..."
+  $as_echo "68. DMRTest.at:295: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:282"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:295 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:282: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:282"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:295: mv stdout \$baseline.tmp"
+echo DMRTest.at:295 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:282: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:282"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:295 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:282: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:282"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:295 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:282"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_57
-#AT_START_58
-at_fn_group_banner 58 'DMRTest.at:283' \
-  "intern test_array_2.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_68
+#AT_START_69
+# 69. DMRTest.at:296: parse dmr-testsuite/test_array_13.xml
+at_setup_line='DMRTest.at:296'
+at_desc="parse dmr-testsuite/test_array_13.xml"
+$at_quiet $as_echo_n " 69: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "58. $at_setup_line: testing $at_desc ..."
+  $as_echo "69. DMRTest.at:296: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_2.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:283"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:296 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:283: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:283"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:296: mv stdout \$baseline.tmp"
+echo DMRTest.at:296 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:283: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:283"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:296 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:283: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:283"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:296: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:296 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:283"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_58
-#AT_START_59
-at_fn_group_banner 59 'DMRTest.at:284' \
-  "intern test_array_3.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_69
+#AT_START_70
+# 70. DMRTest.at:297: parse dmr-testsuite/test_array_14.xml
+at_setup_line='DMRTest.at:297'
+at_desc="parse dmr-testsuite/test_array_14.xml"
+$at_quiet $as_echo_n " 70: $at_desc          "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "59. $at_setup_line: testing $at_desc ..."
+  $as_echo "70. DMRTest.at:297: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:284"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:297 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:284: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:284"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:297: mv stdout \$baseline.tmp"
+echo DMRTest.at:297 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:284: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:284"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:297 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:284: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:284"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:297: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:297 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:284"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_59
-#AT_START_60
-at_fn_group_banner 60 'DMRTest.at:285' \
-  "intern test_array_4.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_70
+#AT_START_71
+# 71. DMRTest.at:300: parse dmr-testsuite/test_simple_6.2.xml
+at_setup_line='DMRTest.at:300'
+at_desc="parse dmr-testsuite/test_simple_6.2.xml"
+$at_quiet $as_echo_n " 71: $at_desc        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "60. $at_setup_line: testing $at_desc ..."
+  $as_echo "71. DMRTest.at:300: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:285"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:300 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:285: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:285"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:300: mv stdout \$baseline.tmp"
+echo DMRTest.at:300 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:285: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:285"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:300 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:285: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:285"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:300: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:300 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:285"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_60
-#AT_START_61
-at_fn_group_banner 61 'DMRTest.at:286' \
-  "intern test_array_5.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_71
+#AT_START_72
+# 72. DMRTest.at:301: parse dmr-testsuite/test_simple_6.3.xml
+at_setup_line='DMRTest.at:301'
+at_desc="parse dmr-testsuite/test_simple_6.3.xml"
+$at_quiet $as_echo_n " 72: $at_desc        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "61. $at_setup_line: testing $at_desc ..."
+  $as_echo "72. DMRTest.at:301: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.intern_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
+    baseline=$input.baseline
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:286"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:301 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:286: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:286"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:301: mv stdout \$baseline.tmp"
+echo DMRTest.at:301 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:286: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:286"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
+echo DMRTest.at:301 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -p $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -p $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:286: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:286"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:301: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:301 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:286"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_61
-#AT_START_62
-at_fn_group_banner 62 'DMRTest.at:287' \
-  "intern test_array_6.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_72
+#AT_START_73
+# 73. DMRTest.at:303: trans test_array_9.xml
+at_setup_line='DMRTest.at:303'
+at_desc="trans test_array_9.xml"
+$at_quiet $as_echo_n " 73: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "62. $at_setup_line: testing $at_desc ..."
+  $as_echo "73. DMRTest.at:303: testing ..."
   $at_traceon
 
 
@@ -7341,64 +10423,93 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:287"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:303 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:287: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:287"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:303: mv stdout \$baseline.tmp"
+echo DMRTest.at:303 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:287: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:287"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:303 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:287: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:287"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:303: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:303 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:287"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -7406,18 +10517,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_62
-#AT_START_63
-at_fn_group_banner 63 'DMRTest.at:288' \
-  "intern test_array_7.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_73
+#AT_START_74
+# 74. DMRTest.at:304: trans test_array_12.xml
+at_setup_line='DMRTest.at:304'
+at_desc="trans test_array_12.xml"
+$at_quiet $as_echo_n " 74: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "63. $at_setup_line: testing $at_desc ..."
+  $as_echo "74. DMRTest.at:304: testing ..."
   $at_traceon
 
 
@@ -7426,64 +10541,93 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:288"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:304 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:288: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:288"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:304: mv stdout \$baseline.tmp"
+echo DMRTest.at:304 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:288: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:288"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:304 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:288: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:288"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:304: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:304 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:288"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -7491,18 +10635,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_63
-#AT_START_64
-at_fn_group_banner 64 'DMRTest.at:289' \
-  "intern test_array_8.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_74
+#AT_START_75
+# 75. DMRTest.at:305: trans test_array_13.xml
+at_setup_line='DMRTest.at:305'
+at_desc="trans test_array_13.xml"
+$at_quiet $as_echo_n " 75: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "64. $at_setup_line: testing $at_desc ..."
+  $as_echo "75. DMRTest.at:305: testing ..."
   $at_traceon
 
 
@@ -7511,64 +10659,93 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:289"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:305 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:289: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:289"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:305: mv stdout \$baseline.tmp"
+echo DMRTest.at:305 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:289: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:289"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:305 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:289: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:289"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:305: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:305 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:289"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -7576,18 +10753,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_64
-#AT_START_65
-at_fn_group_banner 65 'DMRTest.at:290' \
-  "intern test_array_10.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_75
+#AT_START_76
+# 76. DMRTest.at:306: trans test_array_14.xml
+at_setup_line='DMRTest.at:306'
+at_desc="trans test_array_14.xml"
+$at_quiet $as_echo_n " 76: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $as_echo "76. DMRTest.at:306: testing ..."
   $at_traceon
 
 
@@ -7596,64 +10777,93 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_10.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_10.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:290"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:306 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:290: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:290"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:306: mv stdout \$baseline.tmp"
+echo DMRTest.at:306 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:290: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:290"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:306 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:290: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:290"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:306: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:306 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:290"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -7661,18 +10871,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_65
-#AT_START_66
-at_fn_group_banner 66 'DMRTest.at:291' \
-  "intern test_array_11.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_76
+#AT_START_77
+# 77. DMRTest.at:308: trans test_simple_6.2.xml
+at_setup_line='DMRTest.at:308'
+at_desc="trans test_simple_6.2.xml"
+$at_quiet $as_echo_n " 77: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "66. $at_setup_line: testing $at_desc ..."
+  $as_echo "77. DMRTest.at:308: testing ..."
   $at_traceon
 
 
@@ -7681,64 +10895,93 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_11.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_11.xml.intern_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:291"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:308 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:291: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:291"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:308: mv stdout \$baseline.tmp"
+echo DMRTest.at:308 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:291: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:291"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:308 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:291: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:291"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:308: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:308 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:291"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -7746,498 +10989,378 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_66
-#AT_START_67
-at_fn_group_banner 67 'DMRTest.at:294' \
-  "parse dmr-testsuite/test_array_9.xml" "           "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_77
+#AT_START_78
+# 78. DMRTest.at:309: trans test_simple_6.3.xml
+at_setup_line='DMRTest.at:309'
+at_desc="trans test_simple_6.3.xml"
+$at_quiet $as_echo_n " 78: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "67. $at_setup_line: testing $at_desc ..."
+  $as_echo "78. DMRTest.at:309: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
-    baseline=$input.baseline
-
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:294"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:294: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:294"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    if test -n "$baselines" -a x$baselines = xyes; then
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input"
+echo DMRTest.at:309 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
-
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:294: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:294"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+  ( :; $abs_builddir/dmr-test -x -t $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:294: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:294"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:294"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:309: mv stdout \$baseline.tmp"
+echo DMRTest.at:309 >"$at_check_line_file"
 
-
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
 fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
 
-      set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_67
-#AT_START_68
-at_fn_group_banner 68 'DMRTest.at:295' \
-  "parse dmr-testsuite/test_array_12.xml" "          "
-at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
-(
-  $as_echo "68. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
-    baseline=$input.baseline
+else
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input || true"
+echo DMRTest.at:309 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:295"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:295: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:295"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:309: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:309 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:295: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:295"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:295: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:295"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:295"
-$at_failed && at_fn_log_failure
-$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_68
-#AT_START_69
-at_fn_group_banner 69 'DMRTest.at:296' \
-  "parse dmr-testsuite/test_array_13.xml" "          "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_78
+#AT_START_79
+# 79. DMRTest.at:312: trans test_array_9.xml
+at_setup_line='DMRTest.at:312'
+at_desc="trans test_array_9.xml"
+$at_quiet $as_echo_n " 79: $at_desc                         "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "69. $at_setup_line: testing $at_desc ..."
+  $as_echo "79. DMRTest.at:312: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
-    baseline=$input.baseline
-
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:296"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_9.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:296: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:296"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    if test -n "$baselines" -a x$baselines = xyes; then
 
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:312 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
-
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:296: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:296"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:296: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:296"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:296"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:312: mv stdout \$baseline.tmp"
+echo DMRTest.at:312 >"$at_check_line_file"
 
-
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
 fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
 
-      set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_69
-#AT_START_70
-at_fn_group_banner 70 'DMRTest.at:297' \
-  "parse dmr-testsuite/test_array_14.xml" "          "
-at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
-(
-  $as_echo "70. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
-    baseline=$input.baseline
+else
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:312 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:297"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:297: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:297"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:312: diff -b -B \$baseline stdout"
+echo DMRTest.at:312 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:297: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:297"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:297: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:297"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:297"
-$at_failed && at_fn_log_failure
-$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_70
-#AT_START_71
-at_fn_group_banner 71 'DMRTest.at:300' \
-  "parse dmr-testsuite/test_simple_6.2.xml" "        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_79
+#AT_START_80
+# 80. DMRTest.at:313: trans test_array_12.xml
+at_setup_line='DMRTest.at:313'
+at_desc="trans test_array_12.xml"
+$at_quiet $as_echo_n " 80: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "71. $at_setup_line: testing $at_desc ..."
+  $as_echo "80. DMRTest.at:313: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
-    baseline=$input.baseline
-
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    # WORD_ORDER is set by configure in atlocal.
+    # This is a fix for the issue where the CRC32 checksum is different
+    # on little- and big-endian machines, so we use different baseline
+    # files.  jhrg 9/30/15
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:300"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_12.xml.trans_base
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:300: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:300"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+    if test -n "$baselines" -a x$baselines = xyes; then
 
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:313 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
-
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:300: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:300"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:300: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:300"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:300"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:313: mv stdout \$baseline.tmp"
+echo DMRTest.at:313 >"$at_check_line_file"
 
-
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
 fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
 
-      set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_71
-#AT_START_72
-at_fn_group_banner 72 'DMRTest.at:301' \
-  "parse dmr-testsuite/test_simple_6.3.xml" "        "
-at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
-(
-  $as_echo "72. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
-    baseline=$input.baseline
+else
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:313 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:301"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:301: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:301"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:313: diff -b -B \$baseline stdout"
+echo DMRTest.at:313 >"$at_check_line_file"
 
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
 else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:301: \$abs_builddir/dmr-test -x -p \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -p $input || true" "DMRTest.at:301"
-( $at_check_trace; $abs_builddir/dmr-test -x -p $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
-echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-$at_failed && at_fn_log_failure
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:301: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:301"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:301"
-$at_failed && at_fn_log_failure
-$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_72
-#AT_START_73
-at_fn_group_banner 73 'DMRTest.at:303' \
-  "trans test_array_9.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_80
+#AT_START_81
+# 81. DMRTest.at:314: trans test_array_13.xml
+at_setup_line='DMRTest.at:314'
+at_desc="trans test_array_13.xml"
+$at_quiet $as_echo_n " 81: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "73. $at_setup_line: testing $at_desc ..."
+  $as_echo "81. DMRTest.at:314: testing ..."
   $at_traceon
 
 
@@ -8247,64 +11370,93 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_13.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:303"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:314 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:303: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:303"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:314: mv stdout \$baseline.tmp"
+echo DMRTest.at:314 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:303: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:303"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:314 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:303: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:303"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:314: diff -b -B \$baseline stdout"
+echo DMRTest.at:314 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:303"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8312,18 +11464,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_73
-#AT_START_74
-at_fn_group_banner 74 'DMRTest.at:304' \
-  "trans test_array_12.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_81
+#AT_START_82
+# 82. DMRTest.at:315: trans test_array_14.xml
+at_setup_line='DMRTest.at:315'
+at_desc="trans test_array_14.xml"
+$at_quiet $as_echo_n " 82: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "74. $at_setup_line: testing $at_desc ..."
+  $as_echo "82. DMRTest.at:315: testing ..."
   $at_traceon
 
 
@@ -8333,64 +11489,93 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_14.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:304"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:315: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:315 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:304: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:304"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:315: mv stdout \$baseline.tmp"
+echo DMRTest.at:315 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:304: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:304"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:315: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:315 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:304: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:304"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:315: diff -b -B \$baseline stdout"
+echo DMRTest.at:315 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:304"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8398,18 +11583,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_74
-#AT_START_75
-at_fn_group_banner 75 'DMRTest.at:305' \
-  "trans test_array_13.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_82
+#AT_START_83
+# 83. DMRTest.at:317: trans test_simple_6.2.xml
+at_setup_line='DMRTest.at:317'
+at_desc="trans test_simple_6.2.xml"
+$at_quiet $as_echo_n " 83: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "75. $at_setup_line: testing $at_desc ..."
+  $as_echo "83. DMRTest.at:317: testing ..."
   $at_traceon
 
 
@@ -8419,64 +11608,93 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.2.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:305"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:317 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:305: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:305"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:317: mv stdout \$baseline.tmp"
+echo DMRTest.at:317 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:305: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:305"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:317 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:305: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:305"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:317: diff -b -B \$baseline stdout"
+echo DMRTest.at:317 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:305"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8484,18 +11702,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_75
-#AT_START_76
-at_fn_group_banner 76 'DMRTest.at:306' \
-  "trans test_array_14.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_83
+#AT_START_84
+# 84. DMRTest.at:318: trans test_simple_6.3.xml
+at_setup_line='DMRTest.at:318'
+at_desc="trans test_simple_6.3.xml"
+$at_quiet $as_echo_n " 84: $at_desc                      "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "76. $at_setup_line: testing $at_desc ..."
+  $as_echo "84. DMRTest.at:318: testing ..."
   $at_traceon
 
 
@@ -8505,64 +11727,93 @@ at_xfail=no
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
 
-    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.3.xml.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:306"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:318 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:306: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:306"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:318: mv stdout \$baseline.tmp"
+echo DMRTest.at:318 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:306: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:306"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:318 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:306: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:306"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:318: diff -b -B \$baseline stdout"
+echo DMRTest.at:318 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:306"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8570,18 +11821,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_76
-#AT_START_77
-at_fn_group_banner 77 'DMRTest.at:308' \
-  "trans test_simple_6.2.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_84
+#AT_START_85
+# 85. DMRTest.at:320: intern test_array_9.xml
+at_setup_line='DMRTest.at:320'
+at_desc="intern test_array_9.xml"
+$at_quiet $as_echo_n " 85: $at_desc                        "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "77. $at_setup_line: testing $at_desc ..."
+  $as_echo "85. DMRTest.at:320: testing ..."
   $at_traceon
 
 
@@ -8590,65 +11845,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:320 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:308"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:308: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:308"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:320: mv stdout \$baseline.tmp"
+echo DMRTest.at:320 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:308: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:308"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:320 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:308: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:308"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:320: diff -b -B \$baseline stdout"
+echo DMRTest.at:320 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:308"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8656,18 +11938,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_77
-#AT_START_78
-at_fn_group_banner 78 'DMRTest.at:309' \
-  "trans test_simple_6.3.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_85
+#AT_START_86
+# 86. DMRTest.at:321: intern test_array_12.xml
+at_setup_line='DMRTest.at:321'
+at_desc="intern test_array_12.xml"
+$at_quiet $as_echo_n " 86: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "78. $at_setup_line: testing $at_desc ..."
+  $as_echo "86. DMRTest.at:321: testing ..."
   $at_traceon
 
 
@@ -8676,65 +11962,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:321 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input" "DMRTest.at:309"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:309: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:309"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:321: mv stdout \$baseline.tmp"
+echo DMRTest.at:321 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:309: \$abs_builddir/dmr-test -x -t \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input || true" "DMRTest.at:309"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:321 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:309: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:309"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:321: diff -b -B \$baseline stdout"
+echo DMRTest.at:321 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:309"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8742,18 +12055,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_78
-#AT_START_79
-at_fn_group_banner 79 'DMRTest.at:312' \
-  "trans test_array_9.xml" "                         "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_86
+#AT_START_87
+# 87. DMRTest.at:322: intern test_array_13.xml
+at_setup_line='DMRTest.at:322'
+at_desc="intern test_array_13.xml"
+$at_quiet $as_echo_n " 87: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "79. $at_setup_line: testing $at_desc ..."
+  $as_echo "87. DMRTest.at:322: testing ..."
   $at_traceon
 
 
@@ -8762,66 +12079,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_9.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:322 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:312"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:312: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:312"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:322: mv stdout \$baseline.tmp"
+echo DMRTest.at:322 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:312: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:312"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:322 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:312: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:312"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:322: diff -b -B \$baseline stdout"
+echo DMRTest.at:322 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:312"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8829,18 +12172,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_79
-#AT_START_80
-at_fn_group_banner 80 'DMRTest.at:313' \
-  "trans test_array_12.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_87
+#AT_START_88
+# 88. DMRTest.at:323: intern test_array_14.xml
+at_setup_line='DMRTest.at:323'
+at_desc="intern test_array_14.xml"
+$at_quiet $as_echo_n " 88: $at_desc                       "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "80. $at_setup_line: testing $at_desc ..."
+  $as_echo "88. DMRTest.at:323: testing ..."
   $at_traceon
 
 
@@ -8849,66 +12196,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_12.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:323 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:313"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:313: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:313"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:323: mv stdout \$baseline.tmp"
+echo DMRTest.at:323 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:313: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:313"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:323 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:313: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:313"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:323: diff -b -B \$baseline stdout"
+echo DMRTest.at:323 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:313"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -8916,18 +12289,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_80
-#AT_START_81
-at_fn_group_banner 81 'DMRTest.at:314' \
-  "trans test_array_13.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_88
+#AT_START_89
+# 89. DMRTest.at:325: intern test_simple_6.2.xml
+at_setup_line='DMRTest.at:325'
+at_desc="intern test_simple_6.2.xml"
+$at_quiet $as_echo_n " 89: $at_desc                     "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "81. $at_setup_line: testing $at_desc ..."
+  $as_echo "89. DMRTest.at:325: testing ..."
   $at_traceon
 
 
@@ -8936,66 +12313,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_13.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:325 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:314"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:314: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:314"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:325: mv stdout \$baseline.tmp"
+echo DMRTest.at:325 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:314: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:314"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:325 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:314: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:314"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:325: diff -b -B \$baseline stdout"
+echo DMRTest.at:325 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:314"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -9003,18 +12406,22 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_81
-#AT_START_82
-at_fn_group_banner 82 'DMRTest.at:315' \
-  "trans test_array_14.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_89
+#AT_START_90
+# 90. DMRTest.at:326: intern test_simple_6.3.xml
+at_setup_line='DMRTest.at:326'
+at_desc="intern test_simple_6.3.xml"
+$at_quiet $as_echo_n " 90: $at_desc                     "
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "82. $at_setup_line: testing $at_desc ..."
+  $as_echo "90. DMRTest.at:326: testing ..."
   $at_traceon
 
 
@@ -9023,66 +12430,92 @@ at_xfail=no
     # This is a fix for the issue where the CRC32 checksum is different
     # on little- and big-endian machines, so we use different baseline
     # files.  jhrg 9/30/15
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.intern_base
 
-    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_array_14.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input"
+echo DMRTest.at:326 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:315: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:315"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:315: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:315"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:326: mv stdout \$baseline.tmp"
+echo DMRTest.at:326 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:315: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:315"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input || true"
+echo DMRTest.at:326 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -i $input || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -i $input || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:315: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:315"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:326: diff -b -B \$baseline stdout"
+echo DMRTest.at:326 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:315"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
@@ -9090,11576 +12523,16085 @@ $at_traceon; }
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_82
-#AT_START_83
-at_fn_group_banner 83 'DMRTest.at:317' \
-  "trans test_simple_6.2.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_90
+#AT_START_91
+# 91. DMRTest.at:334: trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base
+at_setup_line='DMRTest.at:334'
+at_desc="trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base"
+$at_quiet $as_echo_n " 91: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "83. $at_setup_line: testing $at_desc ..."
+  $as_echo "91. DMRTest.at:334: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.1.trans_base
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.2.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\""
+echo DMRTest.at:334 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row;x\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row;x" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row;x" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:317: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:317"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: mv stdout \$baseline.tmp"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:317: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:317"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\" || true"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row;x\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row;x" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row;x" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:317: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:317"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:317"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_83
-#AT_START_84
-at_fn_group_banner 84 'DMRTest.at:318' \
-  "trans test_simple_6.3.xml" "                      "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_91
+#AT_START_92
+# 92. DMRTest.at:334: trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base
+at_setup_line='DMRTest.at:334'
+at_desc="trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base"
+$at_quiet $as_echo_n " 92: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "84. $at_setup_line: testing $at_desc ..."
+  $as_echo "92. DMRTest.at:334: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.2.trans_base
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_6.3.xml.trans_base
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\""
+echo DMRTest.at:334 >"$at_check_line_file"
 
-        echo "The command <>$abs_builddir/dmr-test -x -t $input $checksum_filt<>"
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:318: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:318"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: mv stdout \$baseline.tmp"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:318: \$abs_builddir/dmr-test -x -t \$input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:318"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\" || true"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:318: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:318"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:318"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_84
-#AT_START_85
-at_fn_group_banner 85 'DMRTest.at:320' \
-  "intern test_array_9.xml" "                        "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_92
+#AT_START_93
+# 93. DMRTest.at:334: trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base
+at_setup_line='DMRTest.at:334'
+at_desc="trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base"
+$at_quiet $as_echo_n " 93: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "85. $at_setup_line: testing $at_desc ..."
+  $as_echo "93. DMRTest.at:334: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_9.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_9.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:320"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\""
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:320: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:320"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: mv stdout \$baseline.tmp"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:320: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:320"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\" || true"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:320: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:320"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:320"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_85
-#AT_START_86
-at_fn_group_banner 86 'DMRTest.at:321' \
-  "intern test_array_12.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_93
+#AT_START_94
+# 94. DMRTest.at:334: trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base
+at_setup_line='DMRTest.at:334'
+at_desc="trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base"
+$at_quiet $as_echo_n " 94: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "86. $at_setup_line: testing $at_desc ..."
+  $as_echo "94. DMRTest.at:334: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_12.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_12.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:321"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\""
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:321: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:321"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: mv stdout \$baseline.tmp"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:321: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:321"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\" || true"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:321: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:321"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:321"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_86
-#AT_START_87
-at_fn_group_banner 87 'DMRTest.at:322' \
-  "intern test_array_13.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_94
+#AT_START_95
+# 95. DMRTest.at:334: trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base
+at_setup_line='DMRTest.at:334'
+at_desc="trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base"
+$at_quiet $as_echo_n " 95: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "87. $at_setup_line: testing $at_desc ..."
+  $as_echo "95. DMRTest.at:334: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_13.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_13.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.5.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"x\""
+echo DMRTest.at:334 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:322"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:322: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:322"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: mv stdout \$baseline.tmp"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:322: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:322"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: \$abs_builddir/dmr-test -x -t \$input -c \"x\" || true"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:322: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:322"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:334: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:334 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:322"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:334"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_87
-#AT_START_88
-at_fn_group_banner 88 'DMRTest.at:323' \
-  "intern test_array_14.xml" "                       "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_95
+#AT_START_96
+# 96. DMRTest.at:346: trans ce test_array_4.xml a test_array_4.xml.1.trans_base
+at_setup_line='DMRTest.at:346'
+at_desc="trans ce test_array_4.xml a test_array_4.xml.1.trans_base"
+$at_quiet $as_echo_n " 96: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "88. $at_setup_line: testing $at_desc ..."
+  $as_echo "96. DMRTest.at:346: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_array_14.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_14.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:323"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
+echo DMRTest.at:346 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:323: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:323"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
+echo DMRTest.at:346 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:323: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:323"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
+echo DMRTest.at:346 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:323: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:323"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:346 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:323"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_88
-#AT_START_89
-at_fn_group_banner 89 'DMRTest.at:325' \
-  "intern test_simple_6.2.xml" "                     "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_96
+#AT_START_97
+# 97. DMRTest.at:347: trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base
+at_setup_line='DMRTest.at:347'
+at_desc="trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base"
+$at_quiet $as_echo_n " 97: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "89. $at_setup_line: testing $at_desc ..."
+  $as_echo "97. DMRTest.at:347: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.2.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:325"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:347: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
+echo DMRTest.at:347 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:325: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:325"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:347: mv stdout \$baseline.tmp"
+echo DMRTest.at:347 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:325: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:325"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:347: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
+echo DMRTest.at:347 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:325: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:325"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:347: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:347 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:325"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_89
-#AT_START_90
-at_fn_group_banner 90 'DMRTest.at:326' \
-  "intern test_simple_6.3.xml" "                     "
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_97
+#AT_START_98
+# 98. DMRTest.at:349: trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base
+at_setup_line='DMRTest.at:349'
+at_desc="trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base"
+$at_quiet $as_echo_n " 98: $at_desc"
 at_xfail=no
-      test "pass" = "xfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "90. $at_setup_line: testing $at_desc ..."
+  $as_echo "98. DMRTest.at:349: testing ..."
   $at_traceon
 
 
 
-    # WORD_ORDER is set by configure in atlocal.
-    # This is a fix for the issue where the CRC32 checksum is different
-    # on little- and big-endian machines, so we use different baseline
-    # files.  jhrg 9/30/15
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.3.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.3.xml.intern_base
+    # See above regarding $WORD_ORDER
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input" "DMRTest.at:326"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\""
+echo DMRTest.at:349 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:326: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:326"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:349: mv stdout \$baseline.tmp"
+echo DMRTest.at:349 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:326: \$abs_builddir/dmr-test -x -i \$input || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -i $input || true" "DMRTest.at:326"
-( $at_check_trace; $abs_builddir/dmr-test -x -i $input || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\" || true"
+echo DMRTest.at:349 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:326: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:326"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:349: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:349 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:326"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
 
+$at_failed && at_func_log_failure
+$at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_90
-#AT_START_91
-at_fn_group_banner 91 'DMRTest.at:342' \
-  "trans ce test_array_3.1.dmr row;x test_array_3.1.dmr.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_98
+#AT_START_99
+# 99. DMRTest.at:351: trans ce test_array_4.xml /row=[0:1];/col=[3];a[][]  test_array_4.xml.4.trans_base
+at_setup_line='DMRTest.at:351'
+at_desc="trans ce test_array_4.xml /row=[0:1];/col=[3];a[][]  test_array_4.xml.4.trans_base"
+$at_quiet $as_echo_n " 99: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "91. $at_setup_line: testing $at_desc ..."
+  $as_echo "99. DMRTest.at:351: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\"" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row;x"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \""
+echo DMRTest.at:351 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:342"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:351: mv stdout \$baseline.tmp"
+echo DMRTest.at:351 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row;x\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row;x\" || true" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row;x" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \" || true"
+echo DMRTest.at:351 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:342"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:351: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:351 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_91
-#AT_START_92
-at_fn_group_banner 92 'DMRTest.at:342' \
-  "trans ce test_array_3.1.dmr row=[2:3];x test_array_3.1.dmr.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_99
+#AT_START_100
+# 100. DMRTest.at:353: trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:]  test_array_4.xml.5.trans_base
+at_setup_line='DMRTest.at:353'
+at_desc="trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:]  test_array_4.xml.5.trans_base"
+$at_quiet $as_echo_n "100: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "92. $at_setup_line: testing $at_desc ..."
+  $as_echo "100. DMRTest.at:353: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.5.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \""
+echo DMRTest.at:353 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\"" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:342"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:353: mv stdout \$baseline.tmp"
+echo DMRTest.at:353 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x\" || true" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true"
+echo DMRTest.at:353 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:342"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:353: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:353 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_92
-#AT_START_93
-at_fn_group_banner 93 'DMRTest.at:342' \
-  "trans ce test_array_3.1.dmr row=[2:3];x[0:1] test_array_3.1.dmr.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_100
+#AT_START_101
+# 101. DMRTest.at:355: trans ce test_array_4.xml x[][]  /test_array_4.xml.6.trans_base
+at_setup_line='DMRTest.at:355'
+at_desc="trans ce test_array_4.xml x[][]  /test_array_4.xml.6.trans_base"
+$at_quiet $as_echo_n "101: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "93. $at_setup_line: testing $at_desc ..."
+  $as_echo "101. DMRTest.at:355: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER//test_array_4.xml.6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \""
+echo DMRTest.at:355 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\"" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:342"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:355: mv stdout \$baseline.tmp"
+echo DMRTest.at:355 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"row=[2:3];x[0:1]\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[2:3];x[0:1]\" || true" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[2:3];x[0:1]" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \" || true"
+echo DMRTest.at:355 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:342"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:355: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:355 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_93
-#AT_START_94
-at_fn_group_banner 94 'DMRTest.at:342' \
-  "trans ce test_array_3.1.dmr x[0:1] test_array_3.1.dmr.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_101
+#AT_START_102
+# 102. DMRTest.at:356: trans ce test_array_4.xml /row=[0:1];x[][]  test_array_4.xml.7.trans_base
+at_setup_line='DMRTest.at:356'
+at_desc="trans ce test_array_4.xml /row=[0:1];x[][]  test_array_4.xml.7.trans_base"
+$at_quiet $as_echo_n "102: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "94. $at_setup_line: testing $at_desc ..."
+  $as_echo "102. DMRTest.at:356: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.7.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:356: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \""
+echo DMRTest.at:356 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\"" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[0:1]"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:342"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:356: mv stdout \$baseline.tmp"
+echo DMRTest.at:356 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"x[0:1]\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[0:1]\" || true" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[0:1]" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:356: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \" || true"
+echo DMRTest.at:356 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:342"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:356: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:356 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_94
-#AT_START_95
-at_fn_group_banner 95 'DMRTest.at:342' \
-  "trans ce test_array_3.1.dmr x test_array_3.1.dmr.5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_102
+#AT_START_103
+# 103. DMRTest.at:358: trans ce test_array_4.xml c[2:][2:]  test_array_4.xml.8.trans_base
+at_setup_line='DMRTest.at:358'
+at_desc="trans ce test_array_4.xml c[2:][2:]  test_array_4.xml.8.trans_base"
+$at_quiet $as_echo_n "103: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "95. $at_setup_line: testing $at_desc ..."
+  $as_echo "103. DMRTest.at:358: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_3.1.dmr
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_3.1.dmr.5.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.8.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"x\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\"" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:358: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \""
+echo DMRTest.at:358 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:342"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:358: mv stdout \$baseline.tmp"
+echo DMRTest.at:358 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: \$abs_builddir/dmr-test -x -t \$input -c \"x\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x\" || true" "DMRTest.at:342"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:358: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \" || true"
+echo DMRTest.at:358 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:342: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:342"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:358: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:358 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:342"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_95
-#AT_START_96
-at_fn_group_banner 96 'DMRTest.at:346' \
-  "trans ce test_array_4.xml a test_array_4.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_103
+#AT_START_104
+# 104. DMRTest.at:360: trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base
+at_setup_line='DMRTest.at:360'
+at_desc="trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base"
+$at_quiet $as_echo_n "104: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "96. $at_setup_line: testing $at_desc ..."
+  $as_echo "104. DMRTest.at:360: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:346"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
+echo DMRTest.at:360 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:346: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:346"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:360: mv stdout \$baseline.tmp"
+echo DMRTest.at:360 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:346: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:346"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
+echo DMRTest.at:360 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:346: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:346"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:360: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:360 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:346"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_96
-#AT_START_97
-at_fn_group_banner 97 'DMRTest.at:347' \
-  "trans ce test_array_4.xml a[][]  test_array_4.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_104
+#AT_START_105
+# 105. DMRTest.at:361: trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base
+at_setup_line='DMRTest.at:361'
+at_desc="trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base"
+$at_quiet $as_echo_n "105: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "97. $at_setup_line: testing $at_desc ..."
+  $as_echo "105. DMRTest.at:361: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:347: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:347"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:361: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
+echo DMRTest.at:361 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:347: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:347"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:361: mv stdout \$baseline.tmp"
+echo DMRTest.at:361 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:347: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:347"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:361: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
+echo DMRTest.at:361 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:347: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:347"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:361: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:361 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:347"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_97
-#AT_START_98
-at_fn_group_banner 98 'DMRTest.at:349' \
-  "trans ce test_array_4.xml /row=[0:1];/col=[3];a test_array_4.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_105
+#AT_START_106
+# 106. DMRTest.at:362: trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base
+at_setup_line='DMRTest.at:362'
+at_desc="trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base"
+$at_quiet $as_echo_n "106: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "98. $at_setup_line: testing $at_desc ..."
+  $as_echo "106. DMRTest.at:362: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\"" "DMRTest.at:349"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\""
+echo DMRTest.at:362 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:349: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:349"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:362: mv stdout \$baseline.tmp"
+echo DMRTest.at:362 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:349: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a\" || true" "DMRTest.at:349"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\" || true"
+echo DMRTest.at:362 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:349: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:349"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:362: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:362 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:349"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_98
-#AT_START_99
-at_fn_group_banner 99 'DMRTest.at:351' \
-  "trans ce test_array_4.xml /row=[0:1];/col=[3];a[][]  test_array_4.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_106
+#AT_START_107
+# 107. DMRTest.at:363: trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base
+at_setup_line='DMRTest.at:363'
+at_desc="trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base"
+$at_quiet $as_echo_n "107: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "99. $at_setup_line: testing $at_desc ..."
+  $as_echo "107. DMRTest.at:363: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \"" "DMRTest.at:351"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:363: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\""
+echo DMRTest.at:363 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:351: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:351"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:363: mv stdout \$baseline.tmp"
+echo DMRTest.at:363 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:351: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][] \" || true" "DMRTest.at:351"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:363: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\" || true"
+echo DMRTest.at:363 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:351: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:351"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:363: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:363 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:351"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_99
-#AT_START_100
-at_fn_group_banner 100 'DMRTest.at:353' \
-  "trans ce test_array_4.xml /row=[0:1];/col=[3];a[][];b[0][];c[0:][0:]  test_array_4.xml.5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_107
+#AT_START_108
+# 108. DMRTest.at:365: trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base
+at_setup_line='DMRTest.at:365'
+at_desc="trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base"
+$at_quiet $as_echo_n "108: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "100. $at_setup_line: testing $at_desc ..."
+  $as_echo "108. DMRTest.at:365: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.5.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \"" "DMRTest.at:353"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
+echo DMRTest.at:365 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:353: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:353"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:365: mv stdout \$baseline.tmp"
+echo DMRTest.at:365 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:353: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] \" || true" "DMRTest.at:353"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];/col=[3];a[][];b[0][];c[0:][0:] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
+echo DMRTest.at:365 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:353: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:353"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:365 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:353"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_100
-#AT_START_101
-at_fn_group_banner 101 'DMRTest.at:355' \
-  "trans ce test_array_4.xml x[][]  /test_array_4.xml.6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_108
+#AT_START_109
+# 109. DMRTest.at:366: trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base
+at_setup_line='DMRTest.at:366'
+at_desc="trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base"
+$at_quiet $as_echo_n "109: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "101. $at_setup_line: testing $at_desc ..."
+  $as_echo "109. DMRTest.at:366: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER//test_array_4.xml.6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \"" "DMRTest.at:355"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\""
+echo DMRTest.at:366 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{s}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{s}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{s}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:355: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:355"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:366: mv stdout \$baseline.tmp"
+echo DMRTest.at:366 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:355: \$abs_builddir/dmr-test -x -t \$input -c \"x[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"x[][] \" || true" "DMRTest.at:355"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "x[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\" || true"
+echo DMRTest.at:366 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:355: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:355"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:366: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:366 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:355"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_101
-#AT_START_102
-at_fn_group_banner 102 'DMRTest.at:356' \
-  "trans ce test_array_4.xml /row=[0:1];x[][]  test_array_4.xml.7.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_109
+#AT_START_110
+# 110. DMRTest.at:367: trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base
+at_setup_line='DMRTest.at:367'
+at_desc="trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base"
+$at_quiet $as_echo_n "110: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "102. $at_setup_line: testing $at_desc ..."
+  $as_echo "110. DMRTest.at:367: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.7.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:356: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \"" "DMRTest.at:356"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\""
+echo DMRTest.at:367 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:356: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:356"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:367: mv stdout \$baseline.tmp"
+echo DMRTest.at:367 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:356: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];x[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];x[][] \" || true" "DMRTest.at:356"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];x[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\" || true"
+echo DMRTest.at:367 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:356: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:356"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:367: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:367 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:356"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_102
-#AT_START_103
-at_fn_group_banner 103 'DMRTest.at:358' \
-  "trans ce test_array_4.xml c[2:][2:]  test_array_4.xml.8.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_110
+#AT_START_111
+# 111. DMRTest.at:368: trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base
+at_setup_line='DMRTest.at:368'
+at_desc="trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base"
+$at_quiet $as_echo_n "111: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "103. $at_setup_line: testing $at_desc ..."
+  $as_echo "111. DMRTest.at:368: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_4.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_4.xml.8.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:358: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \"" "DMRTest.at:358"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:368: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\""
+echo DMRTest.at:368 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:358: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:358"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:368: mv stdout \$baseline.tmp"
+echo DMRTest.at:368 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:358: \$abs_builddir/dmr-test -x -t \$input -c \"c[2:][2:] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"c[2:][2:] \" || true" "DMRTest.at:358"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "c[2:][2:] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:368: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\" || true"
+echo DMRTest.at:368 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:358: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:358"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:368: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:368 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:358"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_103
-#AT_START_104
-at_fn_group_banner 104 'DMRTest.at:360' \
-  "trans ce test_simple_6.xml s test_simple_6.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_111
+#AT_START_112
+# 112. DMRTest.at:371: trans ce test_array_6.xml a test_array_6.xml.1.trans_base
+at_setup_line='DMRTest.at:371'
+at_desc="trans ce test_array_6.xml a test_array_6.xml.1.trans_base"
+$at_quiet $as_echo_n "112: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "104. $at_setup_line: testing $at_desc ..."
+  $as_echo "112. DMRTest.at:371: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:360"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
+echo DMRTest.at:371 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:360: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:360"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:371: mv stdout \$baseline.tmp"
+echo DMRTest.at:371 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:360: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:360"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
+echo DMRTest.at:371 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:360: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:360"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:371: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:371 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:360"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_104
-#AT_START_105
-at_fn_group_banner 105 'DMRTest.at:361' \
-  "trans ce test_simple_6.xml s.i1 test_simple_6.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_112
+#AT_START_113
+# 113. DMRTest.at:372: trans ce test_array_6.xml a[][]  test_array_6.xml.1.trans_base
+at_setup_line='DMRTest.at:372'
+at_desc="trans ce test_array_6.xml a[][]  test_array_6.xml.1.trans_base"
+$at_quiet $as_echo_n "113: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "105. $at_setup_line: testing $at_desc ..."
+  $as_echo "113. DMRTest.at:372: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:361: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:361"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
+echo DMRTest.at:372 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:361: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:361"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:372: mv stdout \$baseline.tmp"
+echo DMRTest.at:372 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:361: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:361"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
+echo DMRTest.at:372 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:361: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:361"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:372: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:372 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:361"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_105
-#AT_START_106
-at_fn_group_banner 106 'DMRTest.at:362' \
-  "trans ce test_simple_6.xml s.s test_simple_6.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_113
+#AT_START_114
+# 114. DMRTest.at:373: trans ce test_array_6.xml /row=[0:1];a[][]  test_array_6.xml.2.trans_base
+at_setup_line='DMRTest.at:373'
+at_desc="trans ce test_array_6.xml /row=[0:1];a[][]  test_array_6.xml.2.trans_base"
+$at_quiet $as_echo_n "114: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "106. $at_setup_line: testing $at_desc ..."
+  $as_echo "114. DMRTest.at:373: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\"" "DMRTest.at:362"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:373: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \""
+echo DMRTest.at:373 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:362: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:362"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:373: mv stdout \$baseline.tmp"
+echo DMRTest.at:373 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:362: \$abs_builddir/dmr-test -x -t \$input -c \"s.s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.s\" || true" "DMRTest.at:362"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:373: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \" || true"
+echo DMRTest.at:373 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:362: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:362"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:373: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:373 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:362"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_106
-#AT_START_107
-at_fn_group_banner 107 'DMRTest.at:363' \
-  "trans ce test_simple_6.1.xml s.inner.i2 test_simple_6.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_114
+#AT_START_115
+# 115. DMRTest.at:374: trans ce test_array_6.xml /row=[0:1];a[][1:2]  test_array_6.xml.3.trans_base
+at_setup_line='DMRTest.at:374'
+at_desc="trans ce test_array_6.xml /row=[0:1];a[][1:2]  test_array_6.xml.3.trans_base"
+$at_quiet $as_echo_n "115: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "107. $at_setup_line: testing $at_desc ..."
+  $as_echo "115. DMRTest.at:374: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:363: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\"" "DMRTest.at:363"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \""
+echo DMRTest.at:374 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:363: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:363"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:374: mv stdout \$baseline.tmp"
+echo DMRTest.at:374 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:363: \$abs_builddir/dmr-test -x -t \$input -c \"s.inner.i2\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.inner.i2\" || true" "DMRTest.at:363"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.inner.i2" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \" || true"
+echo DMRTest.at:374 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:363: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:363"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:374: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:374 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:363"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_107
-#AT_START_108
-at_fn_group_banner 108 'DMRTest.at:365' \
-  "trans ce test_simple_6.xml s{i1} test_simple_6.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_115
+#AT_START_116
+# 116. DMRTest.at:377: trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base
+at_setup_line='DMRTest.at:377'
+at_desc="trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base"
+$at_quiet $as_echo_n "116: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "108. $at_setup_line: testing $at_desc ..."
+  $as_echo "116. DMRTest.at:377: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:365"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
+echo DMRTest.at:377 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:365: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:365"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:377: mv stdout \$baseline.tmp"
+echo DMRTest.at:377 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:365: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:365"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
+echo DMRTest.at:377 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:365: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:365"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:377: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:377 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:365"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_108
-#AT_START_109
-at_fn_group_banner 109 'DMRTest.at:366' \
-  "trans ce test_simple_6.xml s{s} test_simple_6.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_116
+#AT_START_117
+# 117. DMRTest.at:378: trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base
+at_setup_line='DMRTest.at:378'
+at_desc="trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base"
+$at_quiet $as_echo_n "117: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "109. $at_setup_line: testing $at_desc ..."
+  $as_echo "117. DMRTest.at:378: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\"" "DMRTest.at:366"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{s}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\""
+echo DMRTest.at:378 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:366: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:366"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:378: mv stdout \$baseline.tmp"
+echo DMRTest.at:378 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:366: \$abs_builddir/dmr-test -x -t \$input -c \"s{s}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{s}\" || true" "DMRTest.at:366"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{s}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\" || true"
+echo DMRTest.at:378 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:366: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:366"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:378: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:378 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:366"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_109
-#AT_START_110
-at_fn_group_banner 110 'DMRTest.at:367' \
-  "trans ce test_simple_6.1.xml s{inner.i2} test_simple_6.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_117
+#AT_START_118
+# 118. DMRTest.at:379: trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base
+at_setup_line='DMRTest.at:379'
+at_desc="trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base"
+$at_quiet $as_echo_n "118: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "110. $at_setup_line: testing $at_desc ..."
+  $as_echo "118. DMRTest.at:379: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
+
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\""
+echo DMRTest.at:379 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\"" "DMRTest.at:367"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.i" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:367: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:367"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:379: mv stdout \$baseline.tmp"
+echo DMRTest.at:379 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:367: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner.i2}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner.i2}\" || true" "DMRTest.at:367"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner.i2}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\" || true"
+echo DMRTest.at:379 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.i" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:367: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:367"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:379: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:379 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:367"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_110
-#AT_START_111
-at_fn_group_banner 111 'DMRTest.at:368' \
-  "trans ce test_simple_6.1.xml s{inner{i2}} test_simple_6.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_118
+#AT_START_119
+# 119. DMRTest.at:380: trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base
+at_setup_line='DMRTest.at:380'
+at_desc="trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base"
+$at_quiet $as_echo_n "119: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "111. $at_setup_line: testing $at_desc ..."
+  $as_echo "119. DMRTest.at:380: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_6.1.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:368: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\"" "DMRTest.at:368"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:380: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\""
+echo DMRTest.at:380 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:368: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:368"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:380: mv stdout \$baseline.tmp"
+echo DMRTest.at:380 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:368: \$abs_builddir/dmr-test -x -t \$input -c \"s{inner{i2}}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{inner{i2}}\" || true" "DMRTest.at:368"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{inner{i2}}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:380: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\" || true"
+echo DMRTest.at:380 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:368: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:368"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:380: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:380 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:368"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_111
-#AT_START_112
-at_fn_group_banner 112 'DMRTest.at:371' \
-  "trans ce test_array_6.xml a test_array_6.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_119
+#AT_START_120
+# 120. DMRTest.at:381: trans ce test_array_6.2.xml a.i[0][1:2]  test_array_6.2.xml.3.trans_base
+at_setup_line='DMRTest.at:381'
+at_desc="trans ce test_array_6.2.xml a.i[0][1:2]  test_array_6.2.xml.3.trans_base"
+$at_quiet $as_echo_n "120: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "112. $at_setup_line: testing $at_desc ..."
+  $as_echo "120. DMRTest.at:381: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:371"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \""
+echo DMRTest.at:381 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:371: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:371"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:381: mv stdout \$baseline.tmp"
+echo DMRTest.at:381 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:371: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:371"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \" || true"
+echo DMRTest.at:381 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:371: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:371"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:381: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:381 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:371"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_112
-#AT_START_113
-at_fn_group_banner 113 'DMRTest.at:372' \
-  "trans ce test_array_6.xml a[][]  test_array_6.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_120
+#AT_START_121
+# 121. DMRTest.at:382: trans ce test_array_6.2.xml a{i[0][1:2]}  test_array_6.2.xml.3.trans_base
+at_setup_line='DMRTest.at:382'
+at_desc="trans ce test_array_6.2.xml a{i[0][1:2]}  test_array_6.2.xml.3.trans_base"
+$at_quiet $as_echo_n "121: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "113. $at_setup_line: testing $at_desc ..."
+  $as_echo "121. DMRTest.at:382: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \"" "DMRTest.at:372"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \""
+echo DMRTest.at:382 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:372: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:372"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:382: mv stdout \$baseline.tmp"
+echo DMRTest.at:382 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:372: \$abs_builddir/dmr-test -x -t \$input -c \"a[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][] \" || true" "DMRTest.at:372"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \" || true"
+echo DMRTest.at:382 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:372: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:372"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:382: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:382 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:372"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_113
-#AT_START_114
-at_fn_group_banner 114 'DMRTest.at:373' \
-  "trans ce test_array_6.xml /row=[0:1];a[][]  test_array_6.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_121
+#AT_START_122
+# 122. DMRTest.at:383: trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2]  test_array_6.2.xml.4.trans_base
+at_setup_line='DMRTest.at:383'
+at_desc="trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2]  test_array_6.2.xml.4.trans_base"
+$at_quiet $as_echo_n "122: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "114. $at_setup_line: testing $at_desc ..."
+  $as_echo "122. DMRTest.at:383: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:373: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \"" "DMRTest.at:373"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \""
+echo DMRTest.at:383 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:373: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:373"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:383: mv stdout \$baseline.tmp"
+echo DMRTest.at:383 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:373: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][] \" || true" "DMRTest.at:373"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \" || true"
+echo DMRTest.at:383 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:373: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:373"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:383: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:383 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:373"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_114
-#AT_START_115
-at_fn_group_banner 115 'DMRTest.at:374' \
-  "trans ce test_array_6.xml /row=[0:1];a[][1:2]  test_array_6.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_122
+#AT_START_123
+# 123. DMRTest.at:384: trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]}  test_array_6.2.xml.4.trans_base
+at_setup_line='DMRTest.at:384'
+at_desc="trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]}  test_array_6.2.xml.4.trans_base"
+$at_quiet $as_echo_n "123: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "115. $at_setup_line: testing $at_desc ..."
+  $as_echo "123. DMRTest.at:384: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \"" "DMRTest.at:374"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \""
+echo DMRTest.at:384 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:374: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:374"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:384: mv stdout \$baseline.tmp"
+echo DMRTest.at:384 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:374: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a[][1:2] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a[][1:2] \" || true" "DMRTest.at:374"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a[][1:2] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \" || true"
+echo DMRTest.at:384 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:374: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:374"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:384: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:384 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:374"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_115
-#AT_START_116
-at_fn_group_banner 116 'DMRTest.at:377' \
-  "trans ce test_array_6.2.xml a test_array_6.2.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_123
+#AT_START_124
+# 124. DMRTest.at:386: trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base
+at_setup_line='DMRTest.at:386'
+at_desc="trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base"
+$at_quiet $as_echo_n "124: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "116. $at_setup_line: testing $at_desc ..."
+  $as_echo "124. DMRTest.at:386: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.5.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:377"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\""
+echo DMRTest.at:386 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.j\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.j" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.j" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:377: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:377"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:386: mv stdout \$baseline.tmp"
+echo DMRTest.at:386 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:377: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:377"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\" || true"
+echo DMRTest.at:386 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a.j" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a.j" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:377: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:377"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:386: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:386 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:377"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_116
-#AT_START_117
-at_fn_group_banner 117 'DMRTest.at:378' \
-  "trans ce test_array_6.2.xml a{i;j} test_array_6.2.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_124
+#AT_START_125
+# 125. DMRTest.at:389: trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base
+at_setup_line='DMRTest.at:389'
+at_desc="trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base"
+$at_quiet $as_echo_n "125: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "117. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. DMRTest.at:389: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\"" "DMRTest.at:378"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i;j}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
+echo DMRTest.at:389 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:378: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:378"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:389: mv stdout \$baseline.tmp"
+echo DMRTest.at:389 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:378: \$abs_builddir/dmr-test -x -t \$input -c \"a{i;j}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i;j}\" || true" "DMRTest.at:378"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i;j}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
+echo DMRTest.at:389 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:378: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:378"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:389: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:389 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:378"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_117
-#AT_START_118
-at_fn_group_banner 118 'DMRTest.at:379' \
-  "trans ce test_array_6.2.xml a.i test_array_6.2.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_125
+#AT_START_126
+# 126. DMRTest.at:392: trans ce test_array_6.1.xml /row=[1:2];a[][0]  test_array_6.1.xml.2.trans_base
+at_setup_line='DMRTest.at:392'
+at_desc="trans ce test_array_6.1.xml /row=[1:2];a[][0]  test_array_6.1.xml.2.trans_base"
+$at_quiet $as_echo_n "126: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "118. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. DMRTest.at:392: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\"" "DMRTest.at:379"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:392: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \""
+echo DMRTest.at:392 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:379: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:379"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:392: mv stdout \$baseline.tmp"
+echo DMRTest.at:392 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:379: \$abs_builddir/dmr-test -x -t \$input -c \"a.i\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i\" || true" "DMRTest.at:379"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:392: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \" || true"
+echo DMRTest.at:392 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:379: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:379"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:392: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:392 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:379"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_118
-#AT_START_119
-at_fn_group_banner 119 'DMRTest.at:380' \
-  "trans ce test_array_6.2.xml a{i} test_array_6.2.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_126
+#AT_START_127
+# 127. DMRTest.at:393: trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base
+at_setup_line='DMRTest.at:393'
+at_desc="trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base"
+$at_quiet $as_echo_n "127: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "119. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. DMRTest.at:393: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:380: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\"" "DMRTest.at:380"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \""
+echo DMRTest.at:393 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:380: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:380"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:393: mv stdout \$baseline.tmp"
+echo DMRTest.at:393 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:380: \$abs_builddir/dmr-test -x -t \$input -c \"a{i}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i}\" || true" "DMRTest.at:380"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \" || true"
+echo DMRTest.at:393 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:380: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:380"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:393: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:393 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:380"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_119
-#AT_START_120
-at_fn_group_banner 120 'DMRTest.at:381' \
-  "trans ce test_array_6.2.xml a.i[0][1:2]  test_array_6.2.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_127
+#AT_START_128
+# 128. DMRTest.at:395: trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base
+at_setup_line='DMRTest.at:395'
+at_desc="trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base"
+$at_quiet $as_echo_n "128: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "120. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. DMRTest.at:395: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \"" "DMRTest.at:381"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \""
+echo DMRTest.at:395 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:381: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:381"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:395: mv stdout \$baseline.tmp"
+echo DMRTest.at:395 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:381: \$abs_builddir/dmr-test -x -t \$input -c \"a.i[0][1:2] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.i[0][1:2] \" || true" "DMRTest.at:381"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.i[0][1:2] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \" || true"
+echo DMRTest.at:395 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:381: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:381"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:395: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:395 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:381"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_120
-#AT_START_121
-at_fn_group_banner 121 'DMRTest.at:382' \
-  "trans ce test_array_6.2.xml a{i[0][1:2]}  test_array_6.2.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_128
+#AT_START_129
+# 129. DMRTest.at:398: trans ce test_array_6.1.xml a{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base
+at_setup_line='DMRTest.at:398'
+at_desc="trans ce test_array_6.1.xml a{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base"
+$at_quiet $as_echo_n "129: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "121. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. DMRTest.at:398: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \"" "DMRTest.at:382"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:398: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \""
+echo DMRTest.at:398 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:382: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:382"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:398: mv stdout \$baseline.tmp"
+echo DMRTest.at:398 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:382: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[0][1:2]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[0][1:2]} \" || true" "DMRTest.at:382"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[0][1:2]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:398: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \" || true"
+echo DMRTest.at:398 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:382: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:382"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:398: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:398 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:382"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_121
-#AT_START_122
-at_fn_group_banner 122 'DMRTest.at:383' \
-  "trans ce test_array_6.2.xml /row=[0:1];a.i[][1:2]  test_array_6.2.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_129
+#AT_START_130
+# 130. DMRTest.at:399: trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base
+at_setup_line='DMRTest.at:399'
+at_desc="trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base"
+$at_quiet $as_echo_n "130: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "122. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. DMRTest.at:399: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \"" "DMRTest.at:383"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \""
+echo DMRTest.at:399 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:383: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:383"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:399: mv stdout \$baseline.tmp"
+echo DMRTest.at:399 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:383: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a.i[][1:2] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a.i[][1:2] \" || true" "DMRTest.at:383"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a.i[][1:2] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \" || true"
+echo DMRTest.at:399 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:383: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:383"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:399: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:399 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:383"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_122
-#AT_START_123
-at_fn_group_banner 123 'DMRTest.at:384' \
-  "trans ce test_array_6.2.xml /row=[0:1];a{i[][1:2]}  test_array_6.2.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_130
+#AT_START_131
+# 131. DMRTest.at:403: trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]}  test_array_6.1.xml.4.trans_base
+at_setup_line='DMRTest.at:403'
+at_desc="trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]}  test_array_6.1.xml.4.trans_base"
+$at_quiet $as_echo_n "131: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $as_echo "131. DMRTest.at:403: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \"" "DMRTest.at:384"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \""
+echo DMRTest.at:403 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:384: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:384"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:403: mv stdout \$baseline.tmp"
+echo DMRTest.at:403 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:384: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[0:1];a{i[][1:2]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[0:1];a{i[][1:2]} \" || true" "DMRTest.at:384"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[0:1];a{i[][1:2]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \" || true"
+echo DMRTest.at:403 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:384: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:384"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:403: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:403 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:384"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'DMRTest.at:386' \
-  "trans ce test_array_6.2.xml a.j test_array_6.2.xml.5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_131
+#AT_START_132
+# 132. DMRTest.at:406: trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base
+at_setup_line='DMRTest.at:406'
+at_desc="trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base"
+$at_quiet $as_echo_n "132: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "132. DMRTest.at:406: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.2.xml.5.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\"" "DMRTest.at:386"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.j"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
+echo DMRTest.at:406 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:386: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:386"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:406: mv stdout \$baseline.tmp"
+echo DMRTest.at:406 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:386: \$abs_builddir/dmr-test -x -t \$input -c \"a.j\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a.j\" || true" "DMRTest.at:386"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a.j" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
+echo DMRTest.at:406 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:386: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:386"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:406: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:406 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:386"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'DMRTest.at:389' \
-  "trans ce test_array_6.1.xml a test_array_6.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_132
+#AT_START_133
+# 133. DMRTest.at:407: trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base
+at_setup_line='DMRTest.at:407'
+at_desc="trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base"
+$at_quiet $as_echo_n "133: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "133. DMRTest.at:407: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"a\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\"" "DMRTest.at:389"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
+echo DMRTest.at:407 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:389: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:389"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:407: mv stdout \$baseline.tmp"
+echo DMRTest.at:407 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:389: \$abs_builddir/dmr-test -x -t \$input -c \"a\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a\" || true" "DMRTest.at:389"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
+echo DMRTest.at:407 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:389: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:389"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:407: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:407 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:389"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'DMRTest.at:392' \
-  "trans ce test_array_6.1.xml /row=[1:2];a[][0]  test_array_6.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_133
+#AT_START_134
+# 134. DMRTest.at:409: trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base
+at_setup_line='DMRTest.at:409'
+at_desc="trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base"
+$at_quiet $as_echo_n "134: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "134. DMRTest.at:409: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:392: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \"" "DMRTest.at:392"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
+echo DMRTest.at:409 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:392: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:392"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:409: mv stdout \$baseline.tmp"
+echo DMRTest.at:409 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:392: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0] \" || true" "DMRTest.at:392"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
+echo DMRTest.at:409 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:392: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:392"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:409: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:409 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:392"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'DMRTest.at:393' \
-  "trans ce test_array_6.1.xml /row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_134
+#AT_START_135
+# 135. DMRTest.at:410: trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base
+at_setup_line='DMRTest.at:410'
+at_desc="trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base"
+$at_quiet $as_echo_n "135: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "135. DMRTest.at:410: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \"" "DMRTest.at:393"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
+echo DMRTest.at:410 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:393: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:393"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:410: mv stdout \$baseline.tmp"
+echo DMRTest.at:410 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:393: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1:2];a[][0]{i;j} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:393"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1:2];a[][0]{i;j} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
+echo DMRTest.at:410 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:393: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:393"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:410: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:410 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:393"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'DMRTest.at:395' \
-  "trans ce test_array_6.1.xml row=[1:2];a[][0]{i;j}  test_array_6.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_135
+#AT_START_136
+# 136. DMRTest.at:412: trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base
+at_setup_line='DMRTest.at:412'
+at_desc="trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base"
+$at_quiet $as_echo_n "136: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "136. DMRTest.at:412: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \"" "DMRTest.at:395"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"outer\""
+echo DMRTest.at:412 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:395: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:395"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:412: mv stdout \$baseline.tmp"
+echo DMRTest.at:412 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:395: \$abs_builddir/dmr-test -x -t \$input -c \"row=[1:2];a[][0]{i;j} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"row=[1:2];a[][0]{i;j} \" || true" "DMRTest.at:395"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "row=[1:2];a[][0]{i;j} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"outer\" || true"
+echo DMRTest.at:412 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:395: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:395"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:412: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:412 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:395"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'DMRTest.at:398' \
-  "trans ce test_array_6.1.xml a{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_136
+#AT_START_137
+# 137. DMRTest.at:413: trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base
+at_setup_line='DMRTest.at:413'
+at_desc="trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base"
+$at_quiet $as_echo_n "137: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "137. DMRTest.at:413: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:398: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \"" "DMRTest.at:398"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\""
+echo DMRTest.at:413 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:398: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:398"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:413: mv stdout \$baseline.tmp"
+echo DMRTest.at:413 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:398: \$abs_builddir/dmr-test -x -t \$input -c \"a{i[1:2][1:3];j} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a{i[1:2][1:3];j} \" || true" "DMRTest.at:398"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a{i[1:2][1:3];j} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\" || true"
+echo DMRTest.at:413 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:398: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:398"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:413: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:413 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:398"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'DMRTest.at:399' \
-  "trans ce test_array_6.1.xml a[][]{i[1:2][1:3];j}  test_array_6.1.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_137
+#AT_START_138
+# 138. DMRTest.at:414: trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base
+at_setup_line='DMRTest.at:414'
+at_desc="trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base"
+$at_quiet $as_echo_n "138: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "138. DMRTest.at:414: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \"" "DMRTest.at:399"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\""
+echo DMRTest.at:414 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:399: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:399"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:414: mv stdout \$baseline.tmp"
+echo DMRTest.at:414 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:399: \$abs_builddir/dmr-test -x -t \$input -c \"a[][]{i[1:2][1:3];j} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"a[][]{i[1:2][1:3];j} \" || true" "DMRTest.at:399"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "a[][]{i[1:2][1:3];j} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\" || true"
+echo DMRTest.at:414 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:399: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:399"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:414: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:414 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:399"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'DMRTest.at:403' \
-  "trans ce test_array_6.1.xml /row=[1];a[][0]{i[][0:1]}  test_array_6.1.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_138
+#AT_START_139
+# 139. DMRTest.at:416: trans ce test_array_7.xml s test_array_7.xml.1.trans_base
+at_setup_line='DMRTest.at:416'
+at_desc="trans ce test_array_7.xml s test_array_7.xml.1.trans_base"
+$at_quiet $as_echo_n "139: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $as_echo "139. DMRTest.at:416: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_6.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_6.1.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \"" "DMRTest.at:403"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
+echo DMRTest.at:416 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:403: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:403"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:416: mv stdout \$baseline.tmp"
+echo DMRTest.at:416 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:403: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[1];a[][0]{i[][0:1]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[1];a[][0]{i[][0:1]} \" || true" "DMRTest.at:403"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[1];a[][0]{i[][0:1]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
+echo DMRTest.at:416 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:403: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:403"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:416: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:416 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:403"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'DMRTest.at:406' \
-  "trans ce test_simple_7.xml s test_simple_7.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_139
+#AT_START_140
+# 140. DMRTest.at:417: trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base
+at_setup_line='DMRTest.at:417'
+at_desc="trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base"
+$at_quiet $as_echo_n "140: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "132. $at_setup_line: testing $at_desc ..."
+  $as_echo "140. DMRTest.at:417: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:406"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
+echo DMRTest.at:417 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:406: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:406"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:417: mv stdout \$baseline.tmp"
+echo DMRTest.at:417 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:406: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:406"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
+echo DMRTest.at:417 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:406: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:406"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:417: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:417 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:406"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'DMRTest.at:407' \
-  "trans ce test_simple_7.xml s{i1;s} test_simple_7.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_140
+#AT_START_141
+# 141. DMRTest.at:419: trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base
+at_setup_line='DMRTest.at:419'
+at_desc="trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base"
+$at_quiet $as_echo_n "141: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $as_echo "141. DMRTest.at:419: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:407"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:419: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
+echo DMRTest.at:419 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:407: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:407"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:419: mv stdout \$baseline.tmp"
+echo DMRTest.at:419 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:407: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:407"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:419: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
+echo DMRTest.at:419 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:407: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:407"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:419: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:419 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:407"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'DMRTest.at:409' \
-  "trans ce test_simple_7.xml s.i1 test_simple_7.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_141
+#AT_START_142
+# 142. DMRTest.at:420: trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base
+at_setup_line='DMRTest.at:420'
+at_desc="trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base"
+$at_quiet $as_echo_n "142: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $as_echo "142. DMRTest.at:420: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:409"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
+echo DMRTest.at:420 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:409: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:409"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:420: mv stdout \$baseline.tmp"
+echo DMRTest.at:420 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:409: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:409"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
+echo DMRTest.at:420 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:409: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:409"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:420: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:420 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:409"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'DMRTest.at:410' \
-  "trans ce test_simple_7.xml s{i1} test_simple_7.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_142
+#AT_START_143
+# 143. DMRTest.at:422: trans ce test_array_7.xml s[1]  test_array_7.xml.3.trans_base
+at_setup_line='DMRTest.at:422'
+at_desc="trans ce test_array_7.xml s[1]  test_array_7.xml.3.trans_base"
+$at_quiet $as_echo_n "143: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $as_echo "143. DMRTest.at:422: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_7.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:410"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \""
+echo DMRTest.at:422 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:410: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:410"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:422: mv stdout \$baseline.tmp"
+echo DMRTest.at:422 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:410: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:410"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \" || true"
+echo DMRTest.at:422 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:410: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:410"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:422: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:422 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:410"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'DMRTest.at:412' \
-  "trans ce test_simple_8.xml outer test_simple_8.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_143
+#AT_START_144
+# 144. DMRTest.at:423: trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base
+at_setup_line='DMRTest.at:423'
+at_desc="trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base"
+$at_quiet $as_echo_n "144: $at_desc"
 at_xfail=no
-      test "Xxfail" = "Xxfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "136. $at_setup_line: testing $at_desc ..."
+  $as_echo "144. DMRTest.at:423: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"outer\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\"" "DMRTest.at:412"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\""
+echo DMRTest.at:423 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:412: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:412"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:423: mv stdout \$baseline.tmp"
+echo DMRTest.at:423 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:412: \$abs_builddir/dmr-test -x -t \$input -c \"outer\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer\" || true" "DMRTest.at:412"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\" || true"
+echo DMRTest.at:423 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:412: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:412"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:423: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:423 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:412"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'DMRTest.at:413' \
-  "trans ce test_simple_8.xml outer.s.s test_simple_8.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_144
+#AT_START_145
+# 145. DMRTest.at:425: trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base
+at_setup_line='DMRTest.at:425'
+at_desc="trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base"
+$at_quiet $as_echo_n "145: $at_desc"
 at_xfail=no
-      test "Xxfail" = "Xxfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "137. $at_setup_line: testing $at_desc ..."
+  $as_echo "145. DMRTest.at:425: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\"" "DMRTest.at:413"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer.s.s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:425: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\""
+echo DMRTest.at:425 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:413: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:413"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:425: mv stdout \$baseline.tmp"
+echo DMRTest.at:425 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:413: \$abs_builddir/dmr-test -x -t \$input -c \"outer.s.s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer.s.s\" || true" "DMRTest.at:413"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer.s.s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:425: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\" || true"
+echo DMRTest.at:425 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:413: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:413"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:425: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:425 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:413"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_137
-#AT_START_138
-at_fn_group_banner 138 'DMRTest.at:414' \
-  "trans ce test_simple_8.xml outer{s{s}} test_simple_8.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_145
+#AT_START_146
+# 146. DMRTest.at:428: trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base
+at_setup_line='DMRTest.at:428'
+at_desc="trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base"
+$at_quiet $as_echo_n "146: $at_desc"
 at_xfail=no
-      test "Xxfail" = "Xxfail" && at_xfail=yes
+      test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "138. $at_setup_line: testing $at_desc ..."
+  $as_echo "146. DMRTest.at:428: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_simple_8.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\"" "DMRTest.at:414"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:428: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\""
+echo DMRTest.at:428 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:414: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:414"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:428: mv stdout \$baseline.tmp"
+echo DMRTest.at:428 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:414: \$abs_builddir/dmr-test -x -t \$input -c \"outer{s{s}}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"outer{s{s}}\" || true" "DMRTest.at:414"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "outer{s{s}}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:428: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\" || true"
+echo DMRTest.at:428 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:414: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:414"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:428: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:428 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:414"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_138
-#AT_START_139
-at_fn_group_banner 139 'DMRTest.at:416' \
-  "trans ce test_array_7.xml s test_array_7.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_146
+#AT_START_147
+# 147. DMRTest.at:429: trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base
+at_setup_line='DMRTest.at:429'
+at_desc="trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base"
+$at_quiet $as_echo_n "147: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "139. $at_setup_line: testing $at_desc ..."
+  $as_echo "147. DMRTest.at:429: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:416"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\""
+echo DMRTest.at:429 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:416: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:416"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:429: mv stdout \$baseline.tmp"
+echo DMRTest.at:429 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:416: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:416"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\" || true"
+echo DMRTest.at:429 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:416: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:416"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:429: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:429 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:416"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_139
-#AT_START_140
-at_fn_group_banner 140 'DMRTest.at:417' \
-  "trans ce test_array_7.xml s{i1;s} test_array_7.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_147
+#AT_START_148
+# 148. DMRTest.at:432: trans ce test_array_7.1.xml  test_array_7.1.xml.1.trans_base
+at_setup_line='DMRTest.at:432'
+at_desc="trans ce test_array_7.1.xml  test_array_7.1.xml.1.trans_base"
+$at_quiet $as_echo_n "148: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "140. $at_setup_line: testing $at_desc ..."
+  $as_echo "148. DMRTest.at:432: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\"" "DMRTest.at:417"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"\""
+echo DMRTest.at:432 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:417: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:417"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:432: mv stdout \$baseline.tmp"
+echo DMRTest.at:432 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:417: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1;s}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1;s}\" || true" "DMRTest.at:417"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1;s}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"\" || true"
+echo DMRTest.at:432 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:417: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:417"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:432: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:432 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:417"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_140
-#AT_START_141
-at_fn_group_banner 141 'DMRTest.at:419' \
-  "trans ce test_array_7.xml s.i1 test_array_7.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_148
+#AT_START_149
+# 149. DMRTest.at:433: trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base
+at_setup_line='DMRTest.at:433'
+at_desc="trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base"
+$at_quiet $as_echo_n "149: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "141. $at_setup_line: testing $at_desc ..."
+  $as_echo "149. DMRTest.at:433: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:419: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:419"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
+echo DMRTest.at:433 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:419: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:419"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:433: mv stdout \$baseline.tmp"
+echo DMRTest.at:433 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:419: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:419"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
+echo DMRTest.at:433 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:419: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:419"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:433: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:433 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:419"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_141
-#AT_START_142
-at_fn_group_banner 142 'DMRTest.at:420' \
-  "trans ce test_array_7.xml s{i1} test_array_7.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_149
+#AT_START_150
+# 150. DMRTest.at:435: trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base
+at_setup_line='DMRTest.at:435'
+at_desc="trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base"
+$at_quiet $as_echo_n "150: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "142. $at_setup_line: testing $at_desc ..."
+  $as_echo "150. DMRTest.at:435: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:420"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
+echo DMRTest.at:435 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:420: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:420"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:435: mv stdout \$baseline.tmp"
+echo DMRTest.at:435 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:420: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:420"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
+echo DMRTest.at:435 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:420: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:420"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:435: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:435 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:420"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_142
-#AT_START_143
-at_fn_group_banner 143 'DMRTest.at:422' \
-  "trans ce test_array_7.xml s[1]  test_array_7.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_150
+#AT_START_151
+# 151. DMRTest.at:436: trans ce test_array_7.1.xml s.i1[][]  test_array_7.1.xml.2.trans_base
+at_setup_line='DMRTest.at:436'
+at_desc="trans ce test_array_7.1.xml s.i1[][]  test_array_7.1.xml.2.trans_base"
+$at_quiet $as_echo_n "151: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "143. $at_setup_line: testing $at_desc ..."
+  $as_echo "151. DMRTest.at:436: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \"" "DMRTest.at:422"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \""
+echo DMRTest.at:436 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:422: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:422"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:436: mv stdout \$baseline.tmp"
+echo DMRTest.at:436 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:422: \$abs_builddir/dmr-test -x -t \$input -c \"s[1] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1] \" || true" "DMRTest.at:422"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \" || true"
+echo DMRTest.at:436 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:422: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:422"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:436: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:436 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:422"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_143
-#AT_START_144
-at_fn_group_banner 144 'DMRTest.at:423' \
-  "trans ce test_array_7.xml s[1]{i1;s} test_array_7.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_151
+#AT_START_152
+# 152. DMRTest.at:437: trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base
+at_setup_line='DMRTest.at:437'
+at_desc="trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base"
+$at_quiet $as_echo_n "152: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "144. $at_setup_line: testing $at_desc ..."
+  $as_echo "152. DMRTest.at:437: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\"" "DMRTest.at:423"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
+echo DMRTest.at:437 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:423: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:423"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:437: mv stdout \$baseline.tmp"
+echo DMRTest.at:437 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:423: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1;s}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1;s}\" || true" "DMRTest.at:423"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1;s}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
+echo DMRTest.at:437 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:423: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:423"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:437: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:437 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:423"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_144
-#AT_START_145
-at_fn_group_banner 145 'DMRTest.at:425' \
-  "trans ce test_array_7.xml s[1]{i1} test_array_7.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_152
+#AT_START_153
+# 153. DMRTest.at:438: trans ce test_array_7.1.xml s{i1[][]}  test_array_7.1.xml.2.trans_base
+at_setup_line='DMRTest.at:438'
+at_desc="trans ce test_array_7.1.xml s{i1[][]}  test_array_7.1.xml.2.trans_base"
+$at_quiet $as_echo_n "153: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "145. $at_setup_line: testing $at_desc ..."
+  $as_echo "153. DMRTest.at:438: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:425: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\"" "DMRTest.at:425"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:438: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \""
+echo DMRTest.at:438 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:425: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:425"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:438: mv stdout \$baseline.tmp"
+echo DMRTest.at:438 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:425: \$abs_builddir/dmr-test -x -t \$input -c \"s[1]{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s[1]{i1}\" || true" "DMRTest.at:425"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s[1]{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:438: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \" || true"
+echo DMRTest.at:438 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:425: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:425"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:438: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:438 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:425"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_145
-#AT_START_146
-at_fn_group_banner 146 'DMRTest.at:428' \
-  "trans ce test_array_8.xml /col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_153
+#AT_START_154
+# 154. DMRTest.at:440: trans ce test_array_7.1.xml s.i1[0][0]  test_array_7.1.xml.3.trans_base
+at_setup_line='DMRTest.at:440'
+at_desc="trans ce test_array_7.1.xml s.i1[0][0]  test_array_7.1.xml.3.trans_base"
+$at_quiet $as_echo_n "154: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "146. $at_setup_line: testing $at_desc ..."
+  $as_echo "154. DMRTest.at:440: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:428: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\"" "DMRTest.at:428"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \""
+echo DMRTest.at:440 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:428: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:428"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:440: mv stdout \$baseline.tmp"
+echo DMRTest.at:440 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:428: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[1][]{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:428"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[1][]{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \" || true"
+echo DMRTest.at:440 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:428: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:428"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:440: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:440 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:428"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_146
-#AT_START_147
-at_fn_group_banner 147 'DMRTest.at:429' \
-  "trans ce test_array_8.xml col=[1:2];s[1][]{i1} test_array_8.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_154
+#AT_START_155
+# 155. DMRTest.at:441: trans ce test_array_7.1.xml s{i1[0][0]}  test_array_7.1.xml.3.trans_base
+at_setup_line='DMRTest.at:441'
+at_desc="trans ce test_array_7.1.xml s{i1[0][0]}  test_array_7.1.xml.3.trans_base"
+$at_quiet $as_echo_n "155: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "147. $at_setup_line: testing $at_desc ..."
+  $as_echo "155. DMRTest.at:441: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_8.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_8.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\"" "DMRTest.at:429"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \""
+echo DMRTest.at:441 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:429: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:429"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:441: mv stdout \$baseline.tmp"
+echo DMRTest.at:441 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:429: \$abs_builddir/dmr-test -x -t \$input -c \"col=[1:2];s[1][]{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"col=[1:2];s[1][]{i1}\" || true" "DMRTest.at:429"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "col=[1:2];s[1][]{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \" || true"
+echo DMRTest.at:441 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:429: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:429"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:441: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:441 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:429"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_147
-#AT_START_148
-at_fn_group_banner 148 'DMRTest.at:432' \
-  "trans ce test_array_7.1.xml  test_array_7.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_155
+#AT_START_156
+# 156. DMRTest.at:443: trans ce test_array_7.1.xml s.i1[0:2][1:2]  test_array_7.1.xml.4.trans_base
+at_setup_line='DMRTest.at:443'
+at_desc="trans ce test_array_7.1.xml s.i1[0:2][1:2]  test_array_7.1.xml.4.trans_base"
+$at_quiet $as_echo_n "156: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "148. $at_setup_line: testing $at_desc ..."
+  $as_echo "156. DMRTest.at:443: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\"" "DMRTest.at:432"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c ""
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \""
+echo DMRTest.at:443 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:432: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:432"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:443: mv stdout \$baseline.tmp"
+echo DMRTest.at:443 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:432: \$abs_builddir/dmr-test -x -t \$input -c \"\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"\" || true" "DMRTest.at:432"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \" || true"
+echo DMRTest.at:443 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:432: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:432"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:443: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:443 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:432"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_148
-#AT_START_149
-at_fn_group_banner 149 'DMRTest.at:433' \
-  "trans ce test_array_7.1.xml s test_array_7.1.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_156
+#AT_START_157
+# 157. DMRTest.at:447: trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s  test_array_7.1.xml.5.trans_base
+at_setup_line='DMRTest.at:447'
+at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s  test_array_7.1.xml.5.trans_base"
+$at_quiet $as_echo_n "157: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "149. $at_setup_line: testing $at_desc ..."
+  $as_echo "157. DMRTest.at:447: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.1.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.5.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\"" "DMRTest.at:433"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \""
+echo DMRTest.at:447 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:433: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:433"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:447: mv stdout \$baseline.tmp"
+echo DMRTest.at:447 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:433: \$abs_builddir/dmr-test -x -t \$input -c \"s\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s\" || true" "DMRTest.at:433"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \" || true"
+echo DMRTest.at:447 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:433: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:433"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:447: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:447 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:433"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_149
-#AT_START_150
-at_fn_group_banner 150 'DMRTest.at:435' \
-  "trans ce test_array_7.1.xml s.i1 test_array_7.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_157
+#AT_START_158
+# 158. DMRTest.at:449: trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1  test_array_7.1.xml.6.trans_base
+at_setup_line='DMRTest.at:449'
+at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1  test_array_7.1.xml.6.trans_base"
+$at_quiet $as_echo_n "158: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "150. $at_setup_line: testing $at_desc ..."
+  $as_echo "158. DMRTest.at:449: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\"" "DMRTest.at:435"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:449: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \""
+echo DMRTest.at:449 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:435: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:435"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:449: mv stdout \$baseline.tmp"
+echo DMRTest.at:449 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:435: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1\" || true" "DMRTest.at:435"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:449: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true"
+echo DMRTest.at:449 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:435: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:435"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:449: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:449 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:435"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_150
-#AT_START_151
-at_fn_group_banner 151 'DMRTest.at:436' \
-  "trans ce test_array_7.1.xml s.i1[][]  test_array_7.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_158
+#AT_START_159
+# 159. DMRTest.at:450: trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][]  test_array_7.1.xml.6.trans_base
+at_setup_line='DMRTest.at:450'
+at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][]  test_array_7.1.xml.6.trans_base"
+$at_quiet $as_echo_n "159: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "151. $at_setup_line: testing $at_desc ..."
+  $as_echo "159. DMRTest.at:450: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \"" "DMRTest.at:436"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:450: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \""
+echo DMRTest.at:450 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:436: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:436"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:450: mv stdout \$baseline.tmp"
+echo DMRTest.at:450 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:436: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[][] \" || true" "DMRTest.at:436"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:450: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true"
+echo DMRTest.at:450 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:436: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:436"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:450: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:450 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:436"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_151
-#AT_START_152
-at_fn_group_banner 152 'DMRTest.at:437' \
-  "trans ce test_array_7.1.xml s{i1} test_array_7.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_159
+#AT_START_160
+# 160. DMRTest.at:451: trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1}  test_array_7.1.xml.6.trans_base
+at_setup_line='DMRTest.at:451'
+at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1}  test_array_7.1.xml.6.trans_base"
+$at_quiet $as_echo_n "160: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "152. $at_setup_line: testing $at_desc ..."
+  $as_echo "160. DMRTest.at:451: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\"" "DMRTest.at:437"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \""
+echo DMRTest.at:451 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:437: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:437"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:451: mv stdout \$baseline.tmp"
+echo DMRTest.at:451 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:437: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1}\" || true" "DMRTest.at:437"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true"
+echo DMRTest.at:451 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:437: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:437"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:451: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:451 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:437"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_152
-#AT_START_153
-at_fn_group_banner 153 'DMRTest.at:438' \
-  "trans ce test_array_7.1.xml s{i1[][]}  test_array_7.1.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_160
+#AT_START_161
+# 161. DMRTest.at:452: trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]}  test_array_7.1.xml.6.trans_base
+at_setup_line='DMRTest.at:452'
+at_desc="trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]}  test_array_7.1.xml.6.trans_base"
+$at_quiet $as_echo_n "161: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "153. $at_setup_line: testing $at_desc ..."
+  $as_echo "161. DMRTest.at:452: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
     input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.2.trans_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:438: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \"" "DMRTest.at:438"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \""
+echo DMRTest.at:452 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:438: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:438"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:452: mv stdout \$baseline.tmp"
+echo DMRTest.at:452 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:438: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[][]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[][]} \" || true" "DMRTest.at:438"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[][]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true"
+echo DMRTest.at:452 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:438: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:438"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:452: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:452 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:438"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_153
-#AT_START_154
-at_fn_group_banner 154 'DMRTest.at:440' \
-  "trans ce test_array_7.1.xml s.i1[0][0]  test_array_7.1.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_161
+#AT_START_162
+# 162. DMRTest.at:455: trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base
+at_setup_line='DMRTest.at:455'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base"
+$at_quiet $as_echo_n "162: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "154. $at_setup_line: testing $at_desc ..."
+  $as_echo "162. DMRTest.at:455: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \"" "DMRTest.at:440"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\""
+echo DMRTest.at:455 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:440: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:440"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:455: mv stdout \$baseline.tmp"
+echo DMRTest.at:455 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:440: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0][0] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0][0] \" || true" "DMRTest.at:440"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0][0] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\" || true"
+echo DMRTest.at:455 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:440: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:440"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:455: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:455 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:440"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_154
-#AT_START_155
-at_fn_group_banner 155 'DMRTest.at:441' \
-  "trans ce test_array_7.1.xml s{i1[0][0]}  test_array_7.1.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_162
+#AT_START_163
+# 163. DMRTest.at:456: trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base
+at_setup_line='DMRTest.at:456'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base"
+$at_quiet $as_echo_n "163: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "155. $at_setup_line: testing $at_desc ..."
+  $as_echo "163. DMRTest.at:456: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \"" "DMRTest.at:441"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\""
+echo DMRTest.at:456 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:441: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:441"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:456: mv stdout \$baseline.tmp"
+echo DMRTest.at:456 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:441: \$abs_builddir/dmr-test -x -t \$input -c \"s{i1[0][0]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s{i1[0][0]} \" || true" "DMRTest.at:441"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s{i1[0][0]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\" || true"
+echo DMRTest.at:456 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:441: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:441"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:456: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:456 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:441"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_155
-#AT_START_156
-at_fn_group_banner 156 'DMRTest.at:443' \
-  "trans ce test_array_7.1.xml s.i1[0:2][1:2]  test_array_7.1.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_163
+#AT_START_164
+# 164. DMRTest.at:457: trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base
+at_setup_line='DMRTest.at:457'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base"
+$at_quiet $as_echo_n "164: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "156. $at_setup_line: testing $at_desc ..."
+  $as_echo "164. DMRTest.at:457: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \"" "DMRTest.at:443"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:457: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\""
+echo DMRTest.at:457 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:443: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:443"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:457: mv stdout \$baseline.tmp"
+echo DMRTest.at:457 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:443: \$abs_builddir/dmr-test -x -t \$input -c \"s.i1[0:2][1:2] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"s.i1[0:2][1:2] \" || true" "DMRTest.at:443"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "s.i1[0:2][1:2] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:457: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\" || true"
+echo DMRTest.at:457 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:443: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:443"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:457: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:457 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:443"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_156
-#AT_START_157
-at_fn_group_banner 157 'DMRTest.at:447' \
-  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s  test_array_7.1.xml.5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_164
+#AT_START_165
+# 165. DMRTest.at:459: trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base
+at_setup_line='DMRTest.at:459'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base"
+$at_quiet $as_echo_n "165: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "157. $at_setup_line: testing $at_desc ..."
+  $as_echo "165. DMRTest.at:459: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.5.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \"" "DMRTest.at:447"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\""
+echo DMRTest.at:459 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:447: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:447"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:459: mv stdout \$baseline.tmp"
+echo DMRTest.at:459 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:447: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s \" || true" "DMRTest.at:447"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\" || true"
+echo DMRTest.at:459 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:447: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:447"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:459: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:459 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:447"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_157
-#AT_START_158
-at_fn_group_banner 158 'DMRTest.at:449' \
-  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1  test_array_7.1.xml.6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_165
+#AT_START_166
+# 166. DMRTest.at:460: trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base
+at_setup_line='DMRTest.at:460'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base"
+$at_quiet $as_echo_n "166: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "158. $at_setup_line: testing $at_desc ..."
+  $as_echo "166. DMRTest.at:460: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:449: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \"" "DMRTest.at:449"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\""
+echo DMRTest.at:460 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:449: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:449"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:460: mv stdout \$baseline.tmp"
+echo DMRTest.at:460 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:449: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1 \" || true" "DMRTest.at:449"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1 " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\" || true"
+echo DMRTest.at:460 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:449: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:449"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:460: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:460 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:449"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_158
-#AT_START_159
-at_fn_group_banner 159 'DMRTest.at:450' \
-  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s.i1[][]  test_array_7.1.xml.6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_166
+#AT_START_167
+# 167. DMRTest.at:462: trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base
+at_setup_line='DMRTest.at:462'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base"
+$at_quiet $as_echo_n "167: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "159. $at_setup_line: testing $at_desc ..."
+  $as_echo "167. DMRTest.at:462: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:450: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \"" "DMRTest.at:450"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:462: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\""
+echo DMRTest.at:462 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:450: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:450"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:462: mv stdout \$baseline.tmp"
+echo DMRTest.at:462 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:450: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s.i1[][] \" || true" "DMRTest.at:450"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s.i1[][] " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:462: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\" || true"
+echo DMRTest.at:462 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:450: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:450"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:462: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:462 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:450"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_159
-#AT_START_160
-at_fn_group_banner 160 'DMRTest.at:451' \
-  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1}  test_array_7.1.xml.6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_167
+#AT_START_168
+# 168. DMRTest.at:463: trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base
+at_setup_line='DMRTest.at:463'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base"
+$at_quiet $as_echo_n "168: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "160. $at_setup_line: testing $at_desc ..."
+  $as_echo "168. DMRTest.at:463: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \"" "DMRTest.at:451"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\""
+echo DMRTest.at:463 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:451: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:451"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:463: mv stdout \$baseline.tmp"
+echo DMRTest.at:463 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:451: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1} \" || true" "DMRTest.at:451"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\" || true"
+echo DMRTest.at:463 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:451: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:451"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:463: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:463 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:451"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_160
-#AT_START_161
-at_fn_group_banner 161 'DMRTest.at:452' \
-  "trans ce test_array_7.1.xml /row=[2:3];/col=[2:3];s{i1[][]}  test_array_7.1.xml.6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_168
+#AT_START_169
+# 169. DMRTest.at:465: trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base
+at_setup_line='DMRTest.at:465'
+at_desc="trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base"
+$at_quiet $as_echo_n "169: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "161. $at_setup_line: testing $at_desc ..."
+  $as_echo "169. DMRTest.at:465: testing ..."
   $at_traceon
 
 
 
     # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.1.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.1.xml.6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \"" "DMRTest.at:452"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} "
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:465: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\""
+echo DMRTest.at:465 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:452: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:452"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:465: mv stdout \$baseline.tmp"
+echo DMRTest.at:465 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:452: \$abs_builddir/dmr-test -x -t \$input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/row=[2:3];/col=[2:3];s{i1[][]} \" || true" "DMRTest.at:452"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/row=[2:3];/col=[2:3];s{i1[][]} " || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:465: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\" || true"
+echo DMRTest.at:465 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:452: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:452"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:465: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:465 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:452"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_161
-#AT_START_162
-at_fn_group_banner 162 'DMRTest.at:455' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1} test_array_7.2.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_169
+#AT_START_170
+# 170. DMRTest.at:469: trans test_array_1.xml scale(x,1)  test_array_1.xml.1.func_base
+at_setup_line='DMRTest.at:469'
+at_desc="trans test_array_1.xml scale(x,1)  test_array_1.xml.1.func_base"
+$at_quiet $as_echo_n "170: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "162. $at_setup_line: testing $at_desc ..."
+  $as_echo "170. DMRTest.at:469: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,1)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.1.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\"" "DMRTest.at:455"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:469 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:455: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:455"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:469: mv stdout \$baseline.tmp"
+echo DMRTest.at:469 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:455: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1}\" || true" "DMRTest.at:455"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:469 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:455: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:455"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:469: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:469 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:455"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_162
-#AT_START_163
-at_fn_group_banner 163 'DMRTest.at:456' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[][]} test_array_7.2.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_170
+#AT_START_171
+# 171. DMRTest.at:470: trans test_array_1.xml scale(x,10)  test_array_1.xml.2.func_base
+at_setup_line='DMRTest.at:470'
+at_desc="trans test_array_1.xml scale(x,10)  test_array_1.xml.2.func_base"
+$at_quiet $as_echo_n "171: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "163. $at_setup_line: testing $at_desc ..."
+  $as_echo "171. DMRTest.at:470: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.2.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\"" "DMRTest.at:456"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:470 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:456: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:456"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:470: mv stdout \$baseline.tmp"
+echo DMRTest.at:470 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:456: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[][]}\" || true" "DMRTest.at:456"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:470 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:456: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:456"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:470: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:470 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:456"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_163
-#AT_START_164
-at_fn_group_banner 164 'DMRTest.at:457' \
-  "trans ce test_array_7.2.xml /col=[1:2];s{i1[][]} test_array_7.2.xml.1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_171
+#AT_START_172
+# 172. DMRTest.at:471: trans test_array_1.xml scale(x,-10)  test_array_1.xml.3.func_base
+at_setup_line='DMRTest.at:471'
+at_desc="trans test_array_1.xml scale(x,-10)  test_array_1.xml.3.func_base"
+$at_quiet $as_echo_n "172: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "164. $at_setup_line: testing $at_desc ..."
+  $as_echo "172. DMRTest.at:471: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.1.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,-10)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.3.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:457: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\"" "DMRTest.at:457"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:471: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:471 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:457: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:457"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:471: mv stdout \$baseline.tmp"
+echo DMRTest.at:471 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:457: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[][]}\" || true" "DMRTest.at:457"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:471: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:471 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:457: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:457"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:471: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:471 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:457"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_164
-#AT_START_165
-at_fn_group_banner 165 'DMRTest.at:459' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[]{i1[0][]} test_array_7.2.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_172
+#AT_START_173
+# 173. DMRTest.at:472: trans test_array_1.xml scale(x,0.001)  test_array_1.xml.4.func_base
+at_setup_line='DMRTest.at:472'
+at_desc="trans test_array_1.xml scale(x,0.001)  test_array_1.xml.4.func_base"
+$at_quiet $as_echo_n "173: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "165. $at_setup_line: testing $at_desc ..."
+  $as_echo "173. DMRTest.at:472: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.4.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\"" "DMRTest.at:459"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:472 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:459: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:459"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:472: mv stdout \$baseline.tmp"
+echo DMRTest.at:472 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:459: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[]{i1[0][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[]{i1[0][]}\" || true" "DMRTest.at:459"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[]{i1[0][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:472 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:459: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:459"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:472: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:472 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:459"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_165
-#AT_START_166
-at_fn_group_banner 166 'DMRTest.at:460' \
-  "trans ce test_array_7.2.xml /col=[1:2];s{i1[0][]} test_array_7.2.xml.2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_173
+#AT_START_174
+# 174. DMRTest.at:473: trans test_array_1.xml scale(x,-0.001)  test_array_1.xml.5.func_base
+at_setup_line='DMRTest.at:473'
+at_desc="trans test_array_1.xml scale(x,-0.001)  test_array_1.xml.5.func_base"
+$at_quiet $as_echo_n "174: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "166. $at_setup_line: testing $at_desc ..."
+  $as_echo "174. DMRTest.at:473: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,-0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.5.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\"" "DMRTest.at:460"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:473 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:460: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:460"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:473: mv stdout \$baseline.tmp"
+echo DMRTest.at:473 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:460: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s{i1[0][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s{i1[0][]}\" || true" "DMRTest.at:460"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s{i1[0][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:473 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:460: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:460"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:473: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:473 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:460"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_166
-#AT_START_167
-at_fn_group_banner 167 'DMRTest.at:462' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1} test_array_7.2.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_174
+#AT_START_175
+# 175. DMRTest.at:477: trans test_array_1.xml scale(x,0x7fffffffffffffff)  test_array_1.xml.6.func_base
+at_setup_line='DMRTest.at:477'
+at_desc="trans test_array_1.xml scale(x,0x7fffffffffffffff)  test_array_1.xml.6.func_base"
+$at_quiet $as_echo_n "175: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "167. $at_setup_line: testing $at_desc ..."
+  $as_echo "175. DMRTest.at:477: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,0x7fffffffffffffff)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.6.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:462: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\"" "DMRTest.at:462"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:477 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:462: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:462"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:477: mv stdout \$baseline.tmp"
+echo DMRTest.at:477 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:462: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1}\" || true" "DMRTest.at:462"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:477 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:462: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:462"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:477: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:477 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:462"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_167
-#AT_START_168
-at_fn_group_banner 168 'DMRTest.at:463' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[][]} test_array_7.2.xml.3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_175
+#AT_START_176
+# 176. DMRTest.at:479: trans test_array_1.xml scale(x,0x8fffffffffffffff)  test_array_1.xml.7.func_base
+at_setup_line='DMRTest.at:479'
+at_desc="trans test_array_1.xml scale(x,0x8fffffffffffffff)  test_array_1.xml.7.func_base"
+$at_quiet $as_echo_n "176: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "168. $at_setup_line: testing $at_desc ..."
+  $as_echo "176. DMRTest.at:479: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
+    fe="scale(x,0x8fffffffffffffff)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.7.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\"" "DMRTest.at:463"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:479 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:463: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:463"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:479: mv stdout \$baseline.tmp"
+echo DMRTest.at:479 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:463: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[][]}\" || true" "DMRTest.at:463"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:479 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:463: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:463"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:479: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:479 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:463"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_168
-#AT_START_169
-at_fn_group_banner 169 'DMRTest.at:465' \
-  "trans ce test_array_7.2.xml /col=[1:2];s[0]{i1[0][]} test_array_7.2.xml.4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_176
+#AT_START_177
+# 177. DMRTest.at:483: trans test_array_5.xml scale(a,0.001)  test_array_5.xml.1.func_base
+at_setup_line='DMRTest.at:483'
+at_desc="trans test_array_5.xml scale(a,0.001)  test_array_5.xml.1.func_base"
+$at_quiet $as_echo_n "177: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "169. $at_setup_line: testing $at_desc ..."
+  $as_echo "177. DMRTest.at:483: testing ..."
   $at_traceon
 
 
 
-    # See above regarding $WORD_ORDER
-    input=$abs_srcdir/dmr-testsuite/test_array_7.2.xml
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_7.2.xml.4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(a,0.001)"
+    ce=""
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.1.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:465: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\"" "DMRTest.at:465"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:483 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:465: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:465"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:483: mv stdout \$baseline.tmp"
+echo DMRTest.at:483 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:465: \$abs_builddir/dmr-test -x -t \$input -c \"/col=[1:2];s[0]{i1[0][]}\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -c \"/col=[1:2];s[0]{i1[0][]}\" || true" "DMRTest.at:465"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -c "/col=[1:2];s[0]{i1[0][]}" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:483 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:465: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:465"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:483: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:483 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:465"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_169
-#AT_START_170
-at_fn_group_banner 170 'DMRTest.at:469' \
-  "trans test_array_1.xml scale(x,1)  test_array_1.xml.1.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_177
+#AT_START_178
+# 178. DMRTest.at:484: trans test_array_5.xml scale(b,0.001)  test_array_5.xml.2.func_base
+at_setup_line='DMRTest.at:484'
+at_desc="trans test_array_5.xml scale(b,0.001)  test_array_5.xml.2.func_base"
+$at_quiet $as_echo_n "178: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "170. $at_setup_line: testing $at_desc ..."
+  $as_echo "178. DMRTest.at:484: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,1)"
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(b,0.001)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.1.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.2.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:469"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:484: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:484 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:469: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:469"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:484: mv stdout \$baseline.tmp"
+echo DMRTest.at:484 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:469: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:469"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:484: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:484 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:469: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:469"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:484: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:484 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:469"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_170
-#AT_START_171
-at_fn_group_banner 171 'DMRTest.at:470' \
-  "trans test_array_1.xml scale(x,10)  test_array_1.xml.2.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_178
+#AT_START_179
+# 179. DMRTest.at:486: trans test_array_5.xml scale(c,0.001)  test_array_5.xml.3.func_base
+at_setup_line='DMRTest.at:486'
+at_desc="trans test_array_5.xml scale(c,0.001)  test_array_5.xml.3.func_base"
+$at_quiet $as_echo_n "179: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "171. $at_setup_line: testing $at_desc ..."
+  $as_echo "179. DMRTest.at:486: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,10)"
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(c,0.001)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.2.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.3.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:470"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:486 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:470: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:470"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:486: mv stdout \$baseline.tmp"
+echo DMRTest.at:486 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:470: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:470"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:486 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:470: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:470"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:486: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:486 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:470"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_171
-#AT_START_172
-at_fn_group_banner 172 'DMRTest.at:471' \
-  "trans test_array_1.xml scale(x,-10)  test_array_1.xml.3.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_179
+#AT_START_180
+# 180. DMRTest.at:487: trans test_array_5.xml scale(d,0.001)  test_array_5.xml.4.func_base
+at_setup_line='DMRTest.at:487'
+at_desc="trans test_array_5.xml scale(d,0.001)  test_array_5.xml.4.func_base"
+$at_quiet $as_echo_n "180: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "172. $at_setup_line: testing $at_desc ..."
+  $as_echo "180. DMRTest.at:487: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,-10)"
+    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
+    fe="scale(d,0.001)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.3.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.4.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:471: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:471"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:487 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:471: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:471"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:487: mv stdout \$baseline.tmp"
+echo DMRTest.at:487 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:471: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:471"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:487 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:471: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:471"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:487: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:487 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:471"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_172
-#AT_START_173
-at_fn_group_banner 173 'DMRTest.at:472' \
-  "trans test_array_1.xml scale(x,0.001)  test_array_1.xml.4.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_180
+#AT_START_181
+# 181. DMRTest.at:492: trans vol_1_ce_1.xml scale(u,10)  vol_1_ce_1.xml.1.func_base
+at_setup_line='DMRTest.at:492'
+at_desc="trans vol_1_ce_1.xml scale(u,10)  vol_1_ce_1.xml.1.func_base"
+$at_quiet $as_echo_n "181: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "173. $at_setup_line: testing $at_desc ..."
+  $as_echo "181. DMRTest.at:492: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(u,10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.4.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.1.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:472"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:492 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:472: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:472"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:492: mv stdout \$baseline.tmp"
+echo DMRTest.at:492 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:472: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:472"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:492 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:472: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:472"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:492: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:492 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:472"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_173
-#AT_START_174
-at_fn_group_banner 174 'DMRTest.at:473' \
-  "trans test_array_1.xml scale(x,-0.001)  test_array_1.xml.5.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_181
+#AT_START_182
+# 182. DMRTest.at:493: trans vol_1_ce_1.xml scale(u,v)  vol_1_ce_1.xml.2.func_base
+at_setup_line='DMRTest.at:493'
+at_desc="trans vol_1_ce_1.xml scale(u,v)  vol_1_ce_1.xml.2.func_base"
+$at_quiet $as_echo_n "182: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "174. $at_setup_line: testing $at_desc ..."
+  $as_echo "182. DMRTest.at:493: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,-0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(u,v)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.5.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.2.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:473"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:493 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:473: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:473"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:493: mv stdout \$baseline.tmp"
+echo DMRTest.at:493 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:473: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:473"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:493 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:473: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:473"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:493: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:493 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:473"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_174
-#AT_START_175
-at_fn_group_banner 175 'DMRTest.at:477' \
-  "trans test_array_1.xml scale(x,0x7fffffffffffffff)  test_array_1.xml.6.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_182
+#AT_START_183
+# 183. DMRTest.at:494: trans vol_1_ce_1.xml scale(scale(u,10),0.01)  vol_1_ce_1.xml.3.func_base
+at_setup_line='DMRTest.at:494'
+at_desc="trans vol_1_ce_1.xml scale(scale(u,10),0.01)  vol_1_ce_1.xml.3.func_base"
+$at_quiet $as_echo_n "183: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "175. $at_setup_line: testing $at_desc ..."
+  $as_echo "183. DMRTest.at:494: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,0x7fffffffffffffff)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(scale(u,10),0.01)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.6.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.3.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:477"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:494 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:477: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:477"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:494: mv stdout \$baseline.tmp"
+echo DMRTest.at:494 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:477: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:477"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:494 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:477: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:477"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:494: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:494 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:477"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_175
-#AT_START_176
-at_fn_group_banner 176 'DMRTest.at:479' \
-  "trans test_array_1.xml scale(x,0x8fffffffffffffff)  test_array_1.xml.7.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_183
+#AT_START_184
+# 184. DMRTest.at:497: trans vol_1_ce_1.xml scale(Point.x,10)  vol_1_ce_1.xml.4.func_base
+at_setup_line='DMRTest.at:497'
+at_desc="trans vol_1_ce_1.xml scale(Point.x,10)  vol_1_ce_1.xml.4.func_base"
+$at_quiet $as_echo_n "184: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "176. $at_setup_line: testing $at_desc ..."
+  $as_echo "184. DMRTest.at:497: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_1.xml
-    fe="scale(x,0x8fffffffffffffff)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(Point.x,10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_1.xml.7.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.4.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:479"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:497 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:479: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:479"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:497: mv stdout \$baseline.tmp"
+echo DMRTest.at:497 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:479: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:479"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:497 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:479: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:479"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:497: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:497 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:479"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_176
-#AT_START_177
-at_fn_group_banner 177 'DMRTest.at:483' \
-  "trans test_array_5.xml scale(a,0.001)  test_array_5.xml.1.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_184
+#AT_START_185
+# 185. DMRTest.at:498: trans vol_1_ce_1.xml scale(Point.x,Point.y)  vol_1_ce_1.xml.5.func_base
+at_setup_line='DMRTest.at:498'
+at_desc="trans vol_1_ce_1.xml scale(Point.x,Point.y)  vol_1_ce_1.xml.5.func_base"
+$at_quiet $as_echo_n "185: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "177. $at_setup_line: testing $at_desc ..."
+  $as_echo "185. DMRTest.at:498: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    fe="scale(a,0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(Point.x,Point.y)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.1.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.5.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:483"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:498 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:483: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:483"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:498: mv stdout \$baseline.tmp"
+echo DMRTest.at:498 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:483: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:483"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:498 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:483: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:483"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:498: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:498 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:483"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_177
-#AT_START_178
-at_fn_group_banner 178 'DMRTest.at:484' \
-  "trans test_array_5.xml scale(b,0.001)  test_array_5.xml.2.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_185
+#AT_START_186
+# 186. DMRTest.at:499: trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01)  vol_1_ce_1.xml.6.func_base
+at_setup_line='DMRTest.at:499'
+at_desc="trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01)  vol_1_ce_1.xml.6.func_base"
+$at_quiet $as_echo_n "186: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "178. $at_setup_line: testing $at_desc ..."
+  $as_echo "186. DMRTest.at:499: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    fe="scale(b,0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(scale(Point.x,10),0.01)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.2.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.6.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:484: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:484"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:499: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:499 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:484: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:484"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:499: mv stdout \$baseline.tmp"
+echo DMRTest.at:499 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:484: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:484"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:499: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:499 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:484: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:484"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:499: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:499 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:484"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_178
-#AT_START_179
-at_fn_group_banner 179 'DMRTest.at:486' \
-  "trans test_array_5.xml scale(c,0.001)  test_array_5.xml.3.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_186
+#AT_START_187
+# 187. DMRTest.at:502: trans vol_1_ce_1.xml scale(\$Byte(20:1,2,3,4),10)  vol_1_ce_1.xml.7.func_base
+at_setup_line='DMRTest.at:502'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10)  vol_1_ce_1.xml.7.func_base"
+$at_quiet $as_echo_n "187: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "179. $at_setup_line: testing $at_desc ..."
+  $as_echo "187. DMRTest.at:502: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    fe="scale(c,0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(\$Byte(20:1,2,3,4),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.3.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.7.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:486"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:502 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:486: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:486"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:502: mv stdout \$baseline.tmp"
+echo DMRTest.at:502 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:486: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:486"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:502 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:486: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:486"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:502: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:502 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:486"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_179
-#AT_START_180
-at_fn_group_banner 180 'DMRTest.at:487' \
-  "trans test_array_5.xml scale(d,0.001)  test_array_5.xml.4.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_187
+#AT_START_188
+# 188. DMRTest.at:503: trans vol_1_ce_1.xml scale(\$Int8(20:10,11,12,-9),10)  vol_1_ce_1.xml.8.func_base
+at_setup_line='DMRTest.at:503'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10)  vol_1_ce_1.xml.8.func_base"
+$at_quiet $as_echo_n "188: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "180. $at_setup_line: testing $at_desc ..."
+  $as_echo "188. DMRTest.at:503: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_array_5.xml
-    fe="scale(d,0.001)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
+    fe="scale(\$Int8(20:10,11,12,-9),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/test_array_5.xml.4.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.8.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:487"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:503 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:487: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:487"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:503: mv stdout \$baseline.tmp"
+echo DMRTest.at:503 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:487: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:487"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:503 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:487: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:487"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:503: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:503 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:487"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_180
-#AT_START_181
-at_fn_group_banner 181 'DMRTest.at:492' \
-  "trans vol_1_ce_1.xml scale(u,10)  vol_1_ce_1.xml.1.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_188
+#AT_START_189
+# 189. DMRTest.at:504: trans vol_1_ce_1.xml scale(\$UInt16(20:1,2,3,4),10)  vol_1_ce_1.xml.9.func_base
+at_setup_line='DMRTest.at:504'
+at_desc="trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10)  vol_1_ce_1.xml.9.func_base"
+$at_quiet $as_echo_n "189: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "181. $at_setup_line: testing $at_desc ..."
+  $as_echo "189. DMRTest.at:504: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(u,10)"
+    fe="scale(\$UInt16(20:1,2,3,4),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.1.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.9.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:492"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:504: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:504 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:492: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:492"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:504: mv stdout \$baseline.tmp"
+echo DMRTest.at:504 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:492: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:492"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:504: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:504 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:492: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:492"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:504: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:504 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:492"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_181
-#AT_START_182
-at_fn_group_banner 182 'DMRTest.at:493' \
-  "trans vol_1_ce_1.xml scale(u,v)  vol_1_ce_1.xml.2.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_189
+#AT_START_190
+# 190. DMRTest.at:505: trans vol_1_ce_1.xml scale(\$Int16(20:1,2,3,-4),10)  vol_1_ce_1.xml.10.func_base
+at_setup_line='DMRTest.at:505'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10)  vol_1_ce_1.xml.10.func_base"
+$at_quiet $as_echo_n "190: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "182. $at_setup_line: testing $at_desc ..."
+  $as_echo "190. DMRTest.at:505: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(u,v)"
+    fe="scale(\$Int16(20:1,2,3,-4),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.2.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.10.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:493"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:505: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:505 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:493: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:493"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:505: mv stdout \$baseline.tmp"
+echo DMRTest.at:505 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:493: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:493"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:505: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:505 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:493: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:493"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:505: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:505 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:493"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_182
-#AT_START_183
-at_fn_group_banner 183 'DMRTest.at:494' \
-  "trans vol_1_ce_1.xml scale(scale(u,10),0.01)  vol_1_ce_1.xml.3.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_190
+#AT_START_191
+# 191. DMRTest.at:506: trans vol_1_ce_1.xml scale(\$UInt32(20:1,2,3,4),10)  vol_1_ce_1.xml.11.func_base
+at_setup_line='DMRTest.at:506'
+at_desc="trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10)  vol_1_ce_1.xml.11.func_base"
+$at_quiet $as_echo_n "191: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "183. $at_setup_line: testing $at_desc ..."
+  $as_echo "191. DMRTest.at:506: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(scale(u,10),0.01)"
+    fe="scale(\$UInt32(20:1,2,3,4),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.3.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.11.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:494"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:506 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:494: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:494"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:506: mv stdout \$baseline.tmp"
+echo DMRTest.at:506 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:494: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:494"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:506 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:494: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:494"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:506: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:506 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:494"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_183
-#AT_START_184
-at_fn_group_banner 184 'DMRTest.at:497' \
-  "trans vol_1_ce_1.xml scale(Point.x,10)  vol_1_ce_1.xml.4.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_191
+#AT_START_192
+# 192. DMRTest.at:507: trans vol_1_ce_1.xml scale(\$Int32(20:1,2,3,-4),10)  vol_1_ce_1.xml.12.func_base
+at_setup_line='DMRTest.at:507'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10)  vol_1_ce_1.xml.12.func_base"
+$at_quiet $as_echo_n "192: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "184. $at_setup_line: testing $at_desc ..."
+  $as_echo "192. DMRTest.at:507: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(Point.x,10)"
+    fe="scale(\$Int32(20:1,2,3,-4),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.4.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.12.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:497"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:507 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:497: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:497"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:507: mv stdout \$baseline.tmp"
+echo DMRTest.at:507 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:497: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:497"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:507 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:497: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:497"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:507: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:507 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:497"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_184
-#AT_START_185
-at_fn_group_banner 185 'DMRTest.at:498' \
-  "trans vol_1_ce_1.xml scale(Point.x,Point.y)  vol_1_ce_1.xml.5.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_192
+#AT_START_193
+# 193. DMRTest.at:508: trans vol_1_ce_1.xml scale(\$UInt64(20:1,2,3,0xffffffffffffffff),1)  vol_1_ce_1.xml.13.func_base
+at_setup_line='DMRTest.at:508'
+at_desc="trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1)  vol_1_ce_1.xml.13.func_base"
+$at_quiet $as_echo_n "193: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "185. $at_setup_line: testing $at_desc ..."
+  $as_echo "193. DMRTest.at:508: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(Point.x,Point.y)"
+    fe="scale(\$UInt64(20:1,2,3,0xffffffffffffffff),1)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.5.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.13.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:498"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:508 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:498: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:498"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:508: mv stdout \$baseline.tmp"
+echo DMRTest.at:508 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:498: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:498"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:508 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:498: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:498"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:508: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:508 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:498"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_185
-#AT_START_186
-at_fn_group_banner 186 'DMRTest.at:499' \
-  "trans vol_1_ce_1.xml scale(scale(Point.x,10),0.01)  vol_1_ce_1.xml.6.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_193
+#AT_START_194
+# 194. DMRTest.at:509: trans vol_1_ce_1.xml scale(\$Int64(20:1,2,3,0x7fffffffffffffff),1)  vol_1_ce_1.xml.14.func_base
+at_setup_line='DMRTest.at:509'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1)  vol_1_ce_1.xml.14.func_base"
+$at_quiet $as_echo_n "194: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "186. $at_setup_line: testing $at_desc ..."
+  $as_echo "194. DMRTest.at:509: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(scale(Point.x,10),0.01)"
+    fe="scale(\$Int64(20:1,2,3,0x7fffffffffffffff),1)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.6.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.14.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:499: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:499"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:509 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:499: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:499"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:509: mv stdout \$baseline.tmp"
+echo DMRTest.at:509 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:499: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:499"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:509 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:499: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:499"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:509: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:509 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:499"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_186
-#AT_START_187
-at_fn_group_banner 187 'DMRTest.at:502' \
-  "trans vol_1_ce_1.xml scale(\\\$Byte(20:1,2,3,4),10)  vol_1_ce_1.xml.7.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_194
+#AT_START_195
+# 195. DMRTest.at:510: trans vol_1_ce_1.xml scale(\$Float32(20:1,2,3,4.55),10)  vol_1_ce_1.xml.15.func_base
+at_setup_line='DMRTest.at:510'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10)  vol_1_ce_1.xml.15.func_base"
+$at_quiet $as_echo_n "195: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "187. $at_setup_line: testing $at_desc ..."
+  $as_echo "195. DMRTest.at:510: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Byte(20:1,2,3,4),10)"
+    fe="scale(\$Float32(20:1,2,3,4.55),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.7.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.15.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:502"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:510 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:502: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:502"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:510: mv stdout \$baseline.tmp"
+echo DMRTest.at:510 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:502: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:502"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:510 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:502: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:502"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:510: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:510 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:502"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_187
-#AT_START_188
-at_fn_group_banner 188 'DMRTest.at:503' \
-  "trans vol_1_ce_1.xml scale(\\\$Int8(20:10,11,12,-9),10)  vol_1_ce_1.xml.8.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_195
+#AT_START_196
+# 196. DMRTest.at:511: trans vol_1_ce_1.xml scale(\$Float64(20:1,2,3,4.55),10)  vol_1_ce_1.xml.16.func_base
+at_setup_line='DMRTest.at:511'
+at_desc="trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10)  vol_1_ce_1.xml.16.func_base"
+$at_quiet $as_echo_n "196: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "188. $at_setup_line: testing $at_desc ..."
+  $as_echo "196. DMRTest.at:511: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Int8(20:10,11,12,-9),10)"
+    fe="scale(\$Float64(20:1,2,3,4.55),10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.8.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.16.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:503"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:511 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:503: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:503"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:511: mv stdout \$baseline.tmp"
+echo DMRTest.at:511 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:503: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:503"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:511 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:503: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:503"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:511: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:511 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:503"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_188
-#AT_START_189
-at_fn_group_banner 189 'DMRTest.at:504' \
-  "trans vol_1_ce_1.xml scale(\\\$UInt16(20:1,2,3,4),10)  vol_1_ce_1.xml.9.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_196
+#AT_START_197
+# 197. DMRTest.at:515: trans vol_1_ce_10.xml scale(lat,10)  vol_1_ce_10.xml.1.func_base
+at_setup_line='DMRTest.at:515'
+at_desc="trans vol_1_ce_10.xml scale(lat,10)  vol_1_ce_10.xml.1.func_base"
+$at_quiet $as_echo_n "197: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "189. $at_setup_line: testing $at_desc ..."
+  $as_echo "197. DMRTest.at:515: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$UInt16(20:1,2,3,4),10)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
+    fe="scale(lat,10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.9.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.1.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:504: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:504"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:515 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:504: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:504"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:515: mv stdout \$baseline.tmp"
+echo DMRTest.at:515 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:504: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:504"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:515 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:504: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:504"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:515: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:515 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:504"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_189
-#AT_START_190
-at_fn_group_banner 190 'DMRTest.at:505' \
-  "trans vol_1_ce_1.xml scale(\\\$Int16(20:1,2,3,-4),10)  vol_1_ce_1.xml.10.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_197
+#AT_START_198
+# 198. DMRTest.at:516: trans vol_1_ce_10.xml scale(lat,10);scale(lon,10)  vol_1_ce_10.xml.2.func_base
+at_setup_line='DMRTest.at:516'
+at_desc="trans vol_1_ce_10.xml scale(lat,10);scale(lon,10)  vol_1_ce_10.xml.2.func_base"
+$at_quiet $as_echo_n "198: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "190. $at_setup_line: testing $at_desc ..."
+  $as_echo "198. DMRTest.at:516: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Int16(20:1,2,3,-4),10)"
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
+    fe="scale(lat,10);scale(lon,10)"
     ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.10.func_base
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.2.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:505: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:505"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:516 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:505: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:505"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:516: mv stdout \$baseline.tmp"
+echo DMRTest.at:516 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:505: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:505"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:516 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:505: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:505"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:516: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:516 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:505"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_190
-#AT_START_191
-at_fn_group_banner 191 'DMRTest.at:506' \
-  "trans vol_1_ce_1.xml scale(\\\$UInt32(20:1,2,3,4),10)  vol_1_ce_1.xml.11.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_198
+#AT_START_199
+# 199. DMRTest.at:517: trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base
+at_setup_line='DMRTest.at:517'
+at_desc="trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base"
+$at_quiet $as_echo_n "199: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "191. $at_setup_line: testing $at_desc ..."
+  $as_echo "199. DMRTest.at:517: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$UInt32(20:1,2,3,4),10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.11.func_base
+    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
+    fe="scale(lat,10);scale(lon,10)"
+    ce="lat[10:11][10:11];lon[10:11][10:11]"
+    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.3.func_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:506"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
+echo DMRTest.at:517 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\""; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:506: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:506"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:517: mv stdout \$baseline.tmp"
+echo DMRTest.at:517 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:506: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:506"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
+echo DMRTest.at:517 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true"; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:506: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:506"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:517: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
+echo DMRTest.at:517 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout || diff -b -B $baseline stderr"; then
+  ( $at_traceon; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout || diff -b -B $baseline stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:506"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_191
-#AT_START_192
-at_fn_group_banner 192 'DMRTest.at:507' \
-  "trans vol_1_ce_1.xml scale(\\\$Int32(20:1,2,3,-4),10)  vol_1_ce_1.xml.12.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_199
+#AT_START_200
+# 200. DMRTest.at:524: filter test_simple_7.xml s test_simple_7.xml.f.trans_base
+at_setup_line='DMRTest.at:524'
+at_desc="filter test_simple_7.xml s test_simple_7.xml.f.trans_base"
+$at_quiet $as_echo_n "200: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "192. $at_setup_line: testing $at_desc ..."
+  $as_echo "200. DMRTest.at:524: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Int32(20:1,2,3,-4),10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.12.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:507"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:524: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:524 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:507: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:507"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:524: mv stdout \$baseline.tmp"
+echo DMRTest.at:524 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:507: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:507"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:524: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:524 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:507: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:507"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:524: diff -b -B \$baseline stdout"
+echo DMRTest.at:524 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:507"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_192
-#AT_START_193
-at_fn_group_banner 193 'DMRTest.at:508' \
-  "trans vol_1_ce_1.xml scale(\\\$UInt64(20:1,2,3,0xffffffffffffffff),1)  vol_1_ce_1.xml.13.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_200
+#AT_START_201
+# 201. DMRTest.at:526: filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base
+at_setup_line='DMRTest.at:526'
+at_desc="filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base"
+$at_quiet $as_echo_n "201: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "193. $at_setup_line: testing $at_desc ..."
+  $as_echo "201. DMRTest.at:526: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$UInt64(20:1,2,3,0xffffffffffffffff),1)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.13.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1==1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:508"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:526 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:508: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:508"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:526: mv stdout \$baseline.tmp"
+echo DMRTest.at:526 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:508: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:508"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:526 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:508: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:508"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:526: diff -b -B \$baseline stdout"
+echo DMRTest.at:526 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:508"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_193
-#AT_START_194
-at_fn_group_banner 194 'DMRTest.at:509' \
-  "trans vol_1_ce_1.xml scale(\\\$Int64(20:1,2,3,0x7fffffffffffffff),1)  vol_1_ce_1.xml.14.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_201
+#AT_START_202
+# 202. DMRTest.at:527: filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base
+at_setup_line='DMRTest.at:527'
+at_desc="filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base"
+$at_quiet $as_echo_n "202: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "194. $at_setup_line: testing $at_desc ..."
+  $as_echo "202. DMRTest.at:527: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Int64(20:1,2,3,0x7fffffffffffffff),1)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.14.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1!=1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:509"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:527 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:509: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:509"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:527: mv stdout \$baseline.tmp"
+echo DMRTest.at:527 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:509: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:509"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:527 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:509: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:509"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:527: diff -b -B \$baseline stdout"
+echo DMRTest.at:527 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:509"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_194
-#AT_START_195
-at_fn_group_banner 195 'DMRTest.at:510' \
-  "trans vol_1_ce_1.xml scale(\\\$Float32(20:1,2,3,4.55),10)  vol_1_ce_1.xml.15.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_202
+#AT_START_203
+# 203. DMRTest.at:528: filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base
+at_setup_line='DMRTest.at:528'
+at_desc="filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base"
+$at_quiet $as_echo_n "203: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "195. $at_setup_line: testing $at_desc ..."
+  $as_echo "203. DMRTest.at:528: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Float32(20:1,2,3,4.55),10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.15.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1<=1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:510"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:528 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:510: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:510"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:528: mv stdout \$baseline.tmp"
+echo DMRTest.at:528 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:510: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:510"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:528 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:510: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:510"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:528: diff -b -B \$baseline stdout"
+echo DMRTest.at:528 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:510"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_195
-#AT_START_196
-at_fn_group_banner 196 'DMRTest.at:511' \
-  "trans vol_1_ce_1.xml scale(\\\$Float64(20:1,2,3,4.55),10)  vol_1_ce_1.xml.16.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_203
+#AT_START_204
+# 204. DMRTest.at:529: filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base
+at_setup_line='DMRTest.at:529'
+at_desc="filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base"
+$at_quiet $as_echo_n "204: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "196. $at_setup_line: testing $at_desc ..."
+  $as_echo "204. DMRTest.at:529: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_1.xml
-    fe="scale(\$Float64(20:1,2,3,4.55),10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_1.xml.16.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1<1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:511"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:529 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:511: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:511"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:529: mv stdout \$baseline.tmp"
+echo DMRTest.at:529 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:511: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:511"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:529 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:511: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:511"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:529: diff -b -B \$baseline stdout"
+echo DMRTest.at:529 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:511"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_196
-#AT_START_197
-at_fn_group_banner 197 'DMRTest.at:515' \
-  "trans vol_1_ce_10.xml scale(lat,10)  vol_1_ce_10.xml.1.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_204
+#AT_START_205
+# 205. DMRTest.at:530: filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base
+at_setup_line='DMRTest.at:530'
+at_desc="filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base"
+$at_quiet $as_echo_n "205: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "197. $at_setup_line: testing $at_desc ..."
+  $as_echo "205. DMRTest.at:530: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
-    fe="scale(lat,10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.1.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1<=1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:515"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:530 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:515: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:515"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:530: mv stdout \$baseline.tmp"
+echo DMRTest.at:530 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:515: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:515"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:530 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:515: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:515"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:530: diff -b -B \$baseline stdout"
+echo DMRTest.at:530 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:515"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_197
-#AT_START_198
-at_fn_group_banner 198 'DMRTest.at:516' \
-  "trans vol_1_ce_10.xml scale(lat,10);scale(lon,10)  vol_1_ce_10.xml.2.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_205
+#AT_START_206
+# 206. DMRTest.at:531: filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base
+at_setup_line='DMRTest.at:531'
+at_desc="filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base"
+$at_quiet $as_echo_n "206: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "198. $at_setup_line: testing $at_desc ..."
+  $as_echo "206. DMRTest.at:531: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
-    fe="scale(lat,10);scale(lon,10)"
-    ce=""
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.2.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1>1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:516"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:531 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:516: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:516"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:531: mv stdout \$baseline.tmp"
+echo DMRTest.at:531 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:516: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:516"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:531 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:516: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:516"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:531: diff -b -B \$baseline stdout"
+echo DMRTest.at:531 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:516"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_198
-#AT_START_199
-at_fn_group_banner 199 'DMRTest.at:517' \
-  "trans vol_1_ce_10.xml scale(lat,10);scale(lon,10) lat[10:11][10:11];lon[10:11][10:11] vol_1_ce_10.xml.3.func_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_206
+#AT_START_207
+# 207. DMRTest.at:532: filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base
+at_setup_line='DMRTest.at:532'
+at_desc="filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base"
+$at_quiet $as_echo_n "207: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "199. $at_setup_line: testing $at_desc ..."
+  $as_echo "207. DMRTest.at:532: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/vol_1_ce_10.xml
-    fe="scale(lat,10);scale(lon,10)"
-    ce="lat[10:11][10:11];lon[10:11][10:11]"
-    baseline=$abs_srcdir/dmr-testsuite/$WORD_ORDER/vol_1_ce_10.xml.3.func_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
+    ce="s|i1>=1024"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\""
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\"" "DMRTest.at:517"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:532 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:517: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:517"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:532: mv stdout \$baseline.tmp"
+echo DMRTest.at:532 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:517: \$abs_builddir/dmr-test -x -t \$input -f \"\$fe\" -c \"\$ce\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/dmr-test -x -t $input -f \"$fe\" -c \"$ce\" || true" "DMRTest.at:517"
-( $at_check_trace; $abs_builddir/dmr-test -x -t $input -f "$fe" -c "$ce" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; tee stderr <"$at_stderr"
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:532 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:517: diff -b -B \$baseline stdout || diff -b -B \$baseline stderr"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout || diff -b -B $baseline stderr" "DMRTest.at:517"
-( $at_check_trace; diff -b -B $baseline stdout || diff -b -B $baseline stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:532: diff -b -B \$baseline stdout"
+echo DMRTest.at:532 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:517"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_199
-#AT_START_200
-at_fn_group_banner 200 'DMRTest.at:524' \
-  "filter test_simple_7.xml s test_simple_7.xml.f.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_207
+#AT_START_208
+# 208. DMRTest.at:534: filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base
+at_setup_line='DMRTest.at:534'
+at_desc="filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base"
+$at_quiet $as_echo_n "208: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "200. $at_setup_line: testing $at_desc ..."
+  $as_echo "208. DMRTest.at:534: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f.trans_base
+    ce="s|1024<i1"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:524: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:524"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:534 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:524: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:524"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:534: mv stdout \$baseline.tmp"
+echo DMRTest.at:534 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:524: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:524"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:534 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:524: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:524"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:534: diff -b -B \$baseline stdout"
+echo DMRTest.at:534 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:524"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_200
-#AT_START_201
-at_fn_group_banner 201 'DMRTest.at:526' \
-  "filter test_simple_7.xml s|i1==1024 test_simple_7.xml.f1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_208
+#AT_START_209
+# 209. DMRTest.at:535: filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base
+at_setup_line='DMRTest.at:535'
+at_desc="filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base"
+$at_quiet $as_echo_n "209: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "201. $at_setup_line: testing $at_desc ..."
+  $as_echo "209. DMRTest.at:535: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1==1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f1.trans_base
+    ce="s|1024<=i1<=32768"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:526"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:535 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:526: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:526"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:535: mv stdout \$baseline.tmp"
+echo DMRTest.at:535 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:526: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:526"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:535 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:526: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:526"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:535: diff -b -B \$baseline stdout"
+echo DMRTest.at:535 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:526"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_201
-#AT_START_202
-at_fn_group_banner 202 'DMRTest.at:527' \
-  "filter test_simple_7.xml s|i1!=1024 test_simple_7.xml.f2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_209
+#AT_START_210
+# 210. DMRTest.at:536: filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base
+at_setup_line='DMRTest.at:536'
+at_desc="filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base"
+$at_quiet $as_echo_n "210: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "202. $at_setup_line: testing $at_desc ..."
+  $as_echo "210. DMRTest.at:536: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1!=1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f2.trans_base
+    ce="s|i1>=1024.0"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:527"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:536 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:527: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:527"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:536: mv stdout \$baseline.tmp"
+echo DMRTest.at:536 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:527: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:527"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:536 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:527: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:527"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:536: diff -b -B \$baseline stdout"
+echo DMRTest.at:536 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:527"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_202
-#AT_START_203
-at_fn_group_banner 203 'DMRTest.at:528' \
-  "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_210
+#AT_START_211
+# 211. DMRTest.at:538: filter test_simple_7.xml s|s==\"Silly test string: 2\" test_simple_7.xml.fs1.trans_base
+at_setup_line='DMRTest.at:538'
+at_desc="filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base"
+$at_quiet $as_echo_n "211: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "203. $at_setup_line: testing $at_desc ..."
+  $as_echo "211. DMRTest.at:538: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1<=1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f3.trans_base
+    ce="s|s==\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:538 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:528: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:528"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:538: mv stdout \$baseline.tmp"
+echo DMRTest.at:538 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:528: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:528"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:538 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:528: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:528"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:538: diff -b -B \$baseline stdout"
+echo DMRTest.at:538 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:528"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_203
-#AT_START_204
-at_fn_group_banner 204 'DMRTest.at:529' \
-  "filter test_simple_7.xml s|i1<1024 test_simple_7.xml.f4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_211
+#AT_START_212
+# 212. DMRTest.at:539: filter test_simple_7.xml s|s!=\"Silly test string: 2\" test_simple_7.xml.fs2.trans_base
+at_setup_line='DMRTest.at:539'
+at_desc="filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base"
+$at_quiet $as_echo_n "212: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "204. $at_setup_line: testing $at_desc ..."
+  $as_echo "212. DMRTest.at:539: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1<1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f4.trans_base
+    ce="s|s!=\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:529"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:539 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:529: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:529"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:539: mv stdout \$baseline.tmp"
+echo DMRTest.at:539 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:529: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:529"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:539 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:529: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:529"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:539: diff -b -B \$baseline stdout"
+echo DMRTest.at:539 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:529"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_204
-#AT_START_205
-at_fn_group_banner 205 'DMRTest.at:530' \
-  "filter test_simple_7.xml s|i1<=1024 test_simple_7.xml.f5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_212
+#AT_START_213
+# 213. DMRTest.at:540: filter test_simple_7.xml s|s<\"Silly test string: 2\" test_simple_7.xml.fs3.trans_base
+at_setup_line='DMRTest.at:540'
+at_desc="filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base"
+$at_quiet $as_echo_n "213: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "205. $at_setup_line: testing $at_desc ..."
+  $as_echo "213. DMRTest.at:540: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1<=1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f5.trans_base
+    ce="s|s<\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:540 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:530: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:530"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:540: mv stdout \$baseline.tmp"
+echo DMRTest.at:540 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:530: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:530"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:540 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:530: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:530"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:540: diff -b -B \$baseline stdout"
+echo DMRTest.at:540 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:530"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_205
-#AT_START_206
-at_fn_group_banner 206 'DMRTest.at:531' \
-  "filter test_simple_7.xml s|i1>1024 test_simple_7.xml.f6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_213
+#AT_START_214
+# 214. DMRTest.at:541: filter test_simple_7.xml s|s<=\"Silly test string: 2\" test_simple_7.xml.fs4.trans_base
+at_setup_line='DMRTest.at:541'
+at_desc="filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base"
+$at_quiet $as_echo_n "214: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "206. $at_setup_line: testing $at_desc ..."
+  $as_echo "214. DMRTest.at:541: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1>1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f6.trans_base
+    ce="s|s<=\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:541: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:541 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:531: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:531"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:541: mv stdout \$baseline.tmp"
+echo DMRTest.at:541 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:531: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:531"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:541: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:541 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:531: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:531"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:541: diff -b -B \$baseline stdout"
+echo DMRTest.at:541 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:531"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_206
-#AT_START_207
-at_fn_group_banner 207 'DMRTest.at:532' \
-  "filter test_simple_7.xml s|i1>=1024 test_simple_7.xml.f7.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_214
+#AT_START_215
+# 215. DMRTest.at:542: filter test_simple_7.xml s|s>\"Silly test string: 2\" test_simple_7.xml.fs5.trans_base
+at_setup_line='DMRTest.at:542'
+at_desc="filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base"
+$at_quiet $as_echo_n "215: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "207. $at_setup_line: testing $at_desc ..."
+  $as_echo "215. DMRTest.at:542: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1>=1024"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f7.trans_base
+    ce="s|s>\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:542 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:532: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:532"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:542: mv stdout \$baseline.tmp"
+echo DMRTest.at:542 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:532: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:532"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:542 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:532: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:532"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:542: diff -b -B \$baseline stdout"
+echo DMRTest.at:542 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:532"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_207
-#AT_START_208
-at_fn_group_banner 208 'DMRTest.at:534' \
-  "filter test_simple_7.xml s|1024<i1 test_simple_7.xml.f8.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_215
+#AT_START_216
+# 216. DMRTest.at:543: filter test_simple_7.xml s|s>=\"Silly test string: 2\" test_simple_7.xml.fs6.trans_base
+at_setup_line='DMRTest.at:543'
+at_desc="filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base"
+$at_quiet $as_echo_n "216: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "208. $at_setup_line: testing $at_desc ..."
+  $as_echo "216. DMRTest.at:543: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|1024<i1"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f8.trans_base
+    ce="s|s>=\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:543 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:534: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:534"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:543: mv stdout \$baseline.tmp"
+echo DMRTest.at:543 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:534: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:534"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:543 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:534: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:534"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:543: diff -b -B \$baseline stdout"
+echo DMRTest.at:543 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:534"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_208
-#AT_START_209
-at_fn_group_banner 209 'DMRTest.at:535' \
-  "filter test_simple_7.xml s|1024<=i1<=32768 test_simple_7.xml.f9.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_216
+#AT_START_217
+# 217. DMRTest.at:544: filter test_simple_7.xml s|s~=\".*2\" test_simple_7.xml.fs7.trans_base
+at_setup_line='DMRTest.at:544'
+at_desc="filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base"
+$at_quiet $as_echo_n "217: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "209. $at_setup_line: testing $at_desc ..."
+  $as_echo "217. DMRTest.at:544: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|1024<=i1<=32768"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.f9.trans_base
+    ce="s|s~=\".*2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:544 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:535: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:535"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:544: mv stdout \$baseline.tmp"
+echo DMRTest.at:544 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:535: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:535"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:544 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:535: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:535"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:544: diff -b -B \$baseline stdout"
+echo DMRTest.at:544 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:535"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_209
-#AT_START_210
-at_fn_group_banner 210 'DMRTest.at:536' \
-  "filter test_simple_7.xml s|i1>=1024.0 test_simple_7.xml.fa.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_217
+#AT_START_218
+# 218. DMRTest.at:548: filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base
+at_setup_line='DMRTest.at:548'
+at_desc="filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base"
+$at_quiet $as_echo_n "218: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "210. $at_setup_line: testing $at_desc ..."
+  $as_echo "218. DMRTest.at:548: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|i1>=1024.0"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fa.trans_base
+    ce="s{i1}|i1<32768"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:548 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:536: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:536"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:548: mv stdout \$baseline.tmp"
+echo DMRTest.at:548 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:536: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:536"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:548 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:536: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:536"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:548: diff -b -B \$baseline stdout"
+echo DMRTest.at:548 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:536"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_210
-#AT_START_211
-at_fn_group_banner 211 'DMRTest.at:538' \
-  "filter test_simple_7.xml s|s==\\\"Silly test string: 2\\\" test_simple_7.xml.fs1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_218
+#AT_START_219
+# 219. DMRTest.at:549: filter test_simple_7.xml s{i1}|s<=\"Silly test string: 2\" test_simple_7.xml.g1.trans_base
+at_setup_line='DMRTest.at:549'
+at_desc="filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base"
+$at_quiet $as_echo_n "219: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "211. $at_setup_line: testing $at_desc ..."
+  $as_echo "219. DMRTest.at:549: testing ..."
   $at_traceon
 
 
 
     input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s==\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs1.trans_base
+    ce="s{i1}|s<=\"Silly test string: 2\""
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:549 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:538: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:538"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:549: mv stdout \$baseline.tmp"
+echo DMRTest.at:549 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:538: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:538"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:549 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:538: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:538"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:549: diff -b -B \$baseline stdout"
+echo DMRTest.at:549 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:538"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_211
-#AT_START_212
-at_fn_group_banner 212 'DMRTest.at:539' \
-  "filter test_simple_7.xml s|s!=\\\"Silly test string: 2\\\" test_simple_7.xml.fs2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_219
+#AT_START_220
+# 220. DMRTest.at:552: filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base
+at_setup_line='DMRTest.at:552'
+at_desc="filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base"
+$at_quiet $as_echo_n "220: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "212. $at_setup_line: testing $at_desc ..."
+  $as_echo "220. DMRTest.at:552: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s!=\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs2.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
+    ce="outer"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:552 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:539: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:539"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:552: mv stdout \$baseline.tmp"
+echo DMRTest.at:552 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:539: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:539"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:552 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:539: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:539"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:552: diff -b -B \$baseline stdout"
+echo DMRTest.at:552 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:539"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_212
-#AT_START_213
-at_fn_group_banner 213 'DMRTest.at:540' \
-  "filter test_simple_7.xml s|s<\\\"Silly test string: 2\\\" test_simple_7.xml.fs3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_220
+#AT_START_221
+# 221. DMRTest.at:553: filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base
+at_setup_line='DMRTest.at:553'
+at_desc="filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base"
+$at_quiet $as_echo_n "221: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "213. $at_setup_line: testing $at_desc ..."
+  $as_echo "221. DMRTest.at:553: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s<\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs3.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
+    ce="outer{x;y}"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:553 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:540: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:540"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:553: mv stdout \$baseline.tmp"
+echo DMRTest.at:553 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:540: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:540"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:553 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:540: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:540"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:553: diff -b -B \$baseline stdout"
+echo DMRTest.at:553 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:540"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_213
-#AT_START_214
-at_fn_group_banner 214 'DMRTest.at:541' \
-  "filter test_simple_7.xml s|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.fs4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_221
+#AT_START_222
+# 222. DMRTest.at:554: filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base
+at_setup_line='DMRTest.at:554'
+at_desc="filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base"
+$at_quiet $as_echo_n "222: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "214. $at_setup_line: testing $at_desc ..."
+  $as_echo "222. DMRTest.at:554: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s<=\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs4.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
+    ce="outer{x;y;inner}"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:541: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:541"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:554 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:541: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:541"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:554: mv stdout \$baseline.tmp"
+echo DMRTest.at:554 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:541: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:541"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:554 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:541: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:541"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:554: diff -b -B \$baseline stdout"
+echo DMRTest.at:554 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:541"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_214
-#AT_START_215
-at_fn_group_banner 215 'DMRTest.at:542' \
-  "filter test_simple_7.xml s|s>\\\"Silly test string: 2\\\" test_simple_7.xml.fs5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_222
+#AT_START_223
+# 223. DMRTest.at:555: filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base
+at_setup_line='DMRTest.at:555'
+at_desc="filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base"
+$at_quiet $as_echo_n "223: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "215. $at_setup_line: testing $at_desc ..."
+  $as_echo "223. DMRTest.at:555: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s>\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs5.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
+    ce="outer{x;y;inner|i1<1000}"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:555 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:542: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:542"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:555: mv stdout \$baseline.tmp"
+echo DMRTest.at:555 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:542: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:542"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:555 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:542: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:542"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:555: diff -b -B \$baseline stdout"
+echo DMRTest.at:555 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:542"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_215
-#AT_START_216
-at_fn_group_banner 216 'DMRTest.at:543' \
-  "filter test_simple_7.xml s|s>=\\\"Silly test string: 2\\\" test_simple_7.xml.fs6.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_223
+#AT_START_224
+# 224. DMRTest.at:556: filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base
+at_setup_line='DMRTest.at:556'
+at_desc="filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base"
+$at_quiet $as_echo_n "224: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "216. $at_setup_line: testing $at_desc ..."
+  $as_echo "224. DMRTest.at:556: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s>=\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs6.trans_base
+    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
+    ce="outer{x;y;inner|i1<1000}|x<0.0"
+    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:556 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:543: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:543"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:556: mv stdout \$baseline.tmp"
+echo DMRTest.at:556 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:543: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:543"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:556 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:543: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:543"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:556: diff -b -B \$baseline stdout"
+echo DMRTest.at:556 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:543"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_216
-#AT_START_217
-at_fn_group_banner 217 'DMRTest.at:544' \
-  "filter test_simple_7.xml s|s~=\\\".*2\\\" test_simple_7.xml.fs7.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_224
+#AT_START_225
+# 225. DMRTest.at:563: filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base
+at_setup_line='DMRTest.at:563'
+at_desc="filter names_with_spaces.dmr /u names_with_spaces.dmr.1.trans_base"
+$at_quiet $as_echo_n "225: $at_desc"
 at_xfail=no
       test "Xpass" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "217. $at_setup_line: testing $at_desc ..."
+  $as_echo "225. DMRTest.at:563: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s|s~=\".*2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.fs7.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces.dmr
+    ce="/u"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:563: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:563 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:563"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:544: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:544"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:563: mv stdout \$baseline.tmp"
+echo DMRTest.at:563 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:563"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:544: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:544"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:563: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:563 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:563"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:544: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:544"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:563: diff -b -B \$baseline stdout"
+echo DMRTest.at:563 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:544"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:563"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_217
-#AT_START_218
-at_fn_group_banner 218 'DMRTest.at:548' \
-  "filter test_simple_7.xml s{i1}|i1<32768 test_simple_7.xml.g1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_225
+#AT_START_226
+# 226. DMRTest.at:564: filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base
+at_setup_line='DMRTest.at:564'
+at_desc="filter names_with_spaces.dmr /inst2/u names_with_spaces.dmr.2.trans_base"
+$at_quiet $as_echo_n "226: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "218. $at_setup_line: testing $at_desc ..."
+  $as_echo "226. DMRTest.at:564: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s{i1}|i1<32768"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces.dmr
+    ce="/inst2/u"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.2.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:564: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:564 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:564"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:548: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:548"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:564: mv stdout \$baseline.tmp"
+echo DMRTest.at:564 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:564"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:548: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:548"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:564: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:564 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:564"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:548: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:548"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:564: diff -b -B \$baseline stdout"
+echo DMRTest.at:564 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:548"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:564"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_218
-#AT_START_219
-at_fn_group_banner 219 'DMRTest.at:549' \
-  "filter test_simple_7.xml s{i1}|s<=\\\"Silly test string: 2\\\" test_simple_7.xml.g1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_226
+#AT_START_227
+# 227. DMRTest.at:565: filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base
+at_setup_line='DMRTest.at:565'
+at_desc="filter names_with_spaces.dmr /inst2/Point.x names_with_spaces.dmr.3.trans_base"
+$at_quiet $as_echo_n "227: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "219. $at_setup_line: testing $at_desc ..."
+  $as_echo "227. DMRTest.at:565: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_7.xml
-    ce="s{i1}|s<=\"Silly test string: 2\""
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_7.xml.g1.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces.dmr
+    ce="/inst2/Point.x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces.dmr.3.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:549"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:565: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:565 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:565"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:549: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:549"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:565: mv stdout \$baseline.tmp"
+echo DMRTest.at:565 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:565"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:549: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:549"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:565: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:565 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:565"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:549: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:549"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:565: diff -b -B \$baseline stdout"
+echo DMRTest.at:565 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:549"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:565"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_219
-#AT_START_220
-at_fn_group_banner 220 'DMRTest.at:552' \
-  "filter test_simple_8.1.xml outer test_simple_8.1.xml.f1.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_227
+#AT_START_228
+# 228. DMRTest.at:567: filter names_with_spaces2.dmr /inst2/\"Point Break\".x names_with_spaces2.dmr.1.trans_base
+at_setup_line='DMRTest.at:567'
+at_desc="filter names_with_spaces2.dmr /inst2/\\\"Point Break\\\".x names_with_spaces2.dmr.1.trans_base"
+$at_quiet $as_echo_n "228: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "220. $at_setup_line: testing $at_desc ..."
+  $as_echo "228. DMRTest.at:567: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
-    ce="outer"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f1.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces2.dmr
+    ce="/inst2/\"Point Break\".x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:567 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:552: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:552"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:567: mv stdout \$baseline.tmp"
+echo DMRTest.at:567 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:552: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:552"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:567: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:567 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:552: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:552"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:567: diff -b -B \$baseline stdout"
+echo DMRTest.at:567 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:552"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:567"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_220
-#AT_START_221
-at_fn_group_banner 221 'DMRTest.at:553' \
-  "filter test_simple_8.1.xml outer{x;y} test_simple_8.1.xml.f2.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_228
+#AT_START_229
+# 229. DMRTest.at:568: filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base
+at_setup_line='DMRTest.at:568'
+at_desc="filter names_with_spaces2.dmr /inst2/Point%20Break.x names_with_spaces2.dmr.1.trans_base"
+$at_quiet $as_echo_n "229: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "221. $at_setup_line: testing $at_desc ..."
+  $as_echo "229. DMRTest.at:568: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
-    ce="outer{x;y}"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f2.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces2.dmr
+    ce="/inst2/Point%20Break.x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:568 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:553: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:553"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:568: mv stdout \$baseline.tmp"
+echo DMRTest.at:568 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:553: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:553"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:568: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:568 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:553: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:553"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:568: diff -b -B \$baseline stdout"
+echo DMRTest.at:568 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:553"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:568"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_221
-#AT_START_222
-at_fn_group_banner 222 'DMRTest.at:554' \
-  "filter test_simple_8.1.xml outer{x;y;inner} test_simple_8.1.xml.f3.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_229
+#AT_START_230
+# 230. DMRTest.at:569: filter names_with_spaces2.dmr /inst2/\"Point%20Break\".x names_with_spaces2.dmr.1.trans_base
+at_setup_line='DMRTest.at:569'
+at_desc="filter names_with_spaces2.dmr /inst2/\\\"Point%20Break\\\".x names_with_spaces2.dmr.1.trans_base"
+$at_quiet $as_echo_n "230: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "222. $at_setup_line: testing $at_desc ..."
+  $as_echo "230. DMRTest.at:569: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
-    ce="outer{x;y;inner}"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f3.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces2.dmr
+    ce="/inst2/\"Point%20Break\".x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces2.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:554"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:569 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:554: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:554"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:569: mv stdout \$baseline.tmp"
+echo DMRTest.at:569 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:554: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:554"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:569: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:569 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:554: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:554"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:569: diff -b -B \$baseline stdout"
+echo DMRTest.at:569 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:554"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:569"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_222
-#AT_START_223
-at_fn_group_banner 223 'DMRTest.at:555' \
-  "filter test_simple_8.1.xml outer{x;y;inner|i1<1000} test_simple_8.1.xml.f4.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_230
+#AT_START_231
+# 231. DMRTest.at:571: filter names_with_spaces2.dmr /inst2/\"New Group\"/x names_with_spaces3.dmr.1.trans_base
+at_setup_line='DMRTest.at:571'
+at_desc="filter names_with_spaces2.dmr /inst2/\\\"New Group\\\"/x names_with_spaces3.dmr.1.trans_base"
+$at_quiet $as_echo_n "231: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "223. $at_setup_line: testing $at_desc ..."
+  $as_echo "231. DMRTest.at:571: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
-    ce="outer{x;y;inner|i1<1000}"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f4.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces2.dmr
+    ce="/inst2/\"New Group\"/x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces3.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:555"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:571 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:555: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:555"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:571: mv stdout \$baseline.tmp"
+echo DMRTest.at:571 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:555: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:555"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:571: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:571 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:555: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:555"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:571: diff -b -B \$baseline stdout"
+echo DMRTest.at:571 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:555"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:571"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_223
-#AT_START_224
-at_fn_group_banner 224 'DMRTest.at:556' \
-  "filter test_simple_8.1.xml outer{x;y;inner|i1<1000}|x<0.0 test_simple_8.1.xml.f5.trans_base" ""
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_231
+#AT_START_232
+# 232. DMRTest.at:572: filter names_with_spaces2.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base
+at_setup_line='DMRTest.at:572'
+at_desc="filter names_with_spaces2.dmr /inst2/New%20Group/x names_with_spaces3.dmr.1.trans_base"
+$at_quiet $as_echo_n "232: $at_desc"
 at_xfail=no
-      test "Xpass" = "Xxfail" && at_xfail=yes
+      test "Xxfail" = "Xxfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "224. $at_setup_line: testing $at_desc ..."
+  $as_echo "232. DMRTest.at:572: testing ..."
   $at_traceon
 
 
 
-    input=$abs_srcdir/dmr-testsuite/test_simple_8.1.xml
-    ce="outer{x;y;inner|i1<1000}|x<0.0"
-    baseline=$abs_srcdir/dmr-testsuite/universal/test_simple_8.1.xml.f5.trans_base
+    input=$abs_srcdir/dmr-testsuite/names_with_spaces2.dmr
+    ce="/inst2/New%20Group/x"
+    baseline=$abs_srcdir/dmr-testsuite/universal/names_with_spaces3.dmr.1.trans_base
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:572 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:556: mv stdout \$baseline.tmp"
-at_fn_check_prepare_dynamic "mv stdout $baseline.tmp" "DMRTest.at:556"
-( $at_check_trace; mv stdout $baseline.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:572: mv stdout \$baseline.tmp"
+echo DMRTest.at:572 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $baseline.tmp"; then
+  ( $at_traceon; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $baseline.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:556: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
-at_fn_check_prepare_notrace 'a shell pipeline' "DMRTest.at:556"
-( $at_check_trace; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:572: \$abs_builddir/dmr-test -x -e -t \$input -c \"\$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "
+echo DMRTest.at:572 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/dmr-test -x -e -t $input -c \"$ce\" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@' "; then
+  ( $at_traceon; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/dmr-test -x -e -t $input -c "$ce" | sed 's@<Value>[0-9a-f][0-9a-f]*</Value>@@'  ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/DMRTest.at:556: diff -b -B \$baseline stdout"
-at_fn_check_prepare_dynamic "diff -b -B $baseline stdout" "DMRTest.at:556"
-( $at_check_trace; diff -b -B $baseline stdout
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/DMRTest.at:572: diff -b -B \$baseline stdout"
+echo DMRTest.at:572 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $baseline stdout"; then
+  ( $at_traceon; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $baseline stdout ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/DMRTest.at:556"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/DMRTest.at:572"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_224
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
+#AT_STOP_232
diff --git a/tests/DMRTest.at b/tests/DMRTest.at
index 8a2ebd5..69d8f91 100644
--- a/tests/DMRTest.at
+++ b/tests/DMRTest.at
@@ -555,3 +555,18 @@ DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer{x;y;inner}], [test_simple_8.1.
 DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer{x;y;inner|i1<1000}], [test_simple_8.1.xml.f4.trans_base], [pass])
 DMR_TRANS_SERIES_CE([test_simple_8.1.xml], [outer{x;y;inner|i1<1000}|x<0.0], [test_simple_8.1.xml.f5.trans_base], [pass])
 
+# These tests are regression tests for bug Hyrax-267. Spaces in variables names
+# broke the DAP4 CE parser
+
+# These mostly fail because thee's a second bug where the variables in a group are 
+# not printing values. 
+DMR_TRANS_SERIES_CE([names_with_spaces.dmr], [/u], [names_with_spaces.dmr.1.trans_base], [pass])
+DMR_TRANS_SERIES_CE([names_with_spaces.dmr], [/inst2/u], [names_with_spaces.dmr.2.trans_base], [xfail])
+DMR_TRANS_SERIES_CE([names_with_spaces.dmr], [/inst2/Point.x], [names_with_spaces.dmr.3.trans_base], [xfail])
+
+DMR_TRANS_SERIES_CE([names_with_spaces2.dmr], [/inst2/\"Point Break\".x], [names_with_spaces2.dmr.1.trans_base], [xfail])
+DMR_TRANS_SERIES_CE([names_with_spaces2.dmr], [/inst2/Point%20Break.x], [names_with_spaces2.dmr.1.trans_base], [xfail])
+DMR_TRANS_SERIES_CE([names_with_spaces2.dmr], [/inst2/\"Point%20Break\".x], [names_with_spaces2.dmr.1.trans_base], [xfail])
+
+DMR_TRANS_SERIES_CE([names_with_spaces2.dmr], [/inst2/\"New Group\"/x], [names_with_spaces3.dmr.1.trans_base], [xfail])
+DMR_TRANS_SERIES_CE([names_with_spaces2.dmr], [/inst2/New%20Group/x], [names_with_spaces3.dmr.1.trans_base], [xfail])
diff --git a/tests/EXPRTest b/tests/EXPRTest
index a5980a6..2ae8fd9 100755
--- a/tests/EXPRTest
+++ b/tests/EXPRTest
@@ -1,17 +1,17 @@
 #! /bin/sh
-# Generated from EXPRTest.at by GNU Autoconf 2.69.
-#
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Generated from EXPRTest.at by GNU Autoconf 2.63.
 #
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,15 +19,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -35,13 +43,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -52,7 +54,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -75,6 +77,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -84,16 +93,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -105,16 +113,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -126,319 +130,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+if as_func_success; then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo as_func_success failed.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
+
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
+fi
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-} # as_fn_mkdir_p
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
+if as_func_ret_success; then
+  :
 else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
 else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
 
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -455,12 +470,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -469,18 +482,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -495,29 +519,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -547,11 +591,6 @@ at_errexit_p=false
 # Shall we be verbose?  ':' means no, empty means yes.
 at_verbose=:
 at_quiet=
-# Running several jobs in parallel, 0 means as many as test groups.
-at_jobs=1
-at_traceon=:
-at_trace_echo=:
-at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -566,8 +605,6 @@ at_list_p=false
 at_clean=false
 # Test groups to run
 at_groups=
-# Whether to rerun failed tests.
-at_recheck=
 # Whether a write failure occurred
 at_write_fail=0
 
@@ -581,10 +618,10 @@ esac
 # Whether -C is in effect.
 at_change_dir=false
 
-# Whether to enable colored test results.
-at_color=no
 # List of the tested programs.
 at_tested=''
+# List of the all the test groups.
+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -616,8 +653,8 @@ at_help_all="1;EXPRTest.at:57;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k
 24;EXPRTest.at:70;expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass);expr;
 25;EXPRTest.at:71;expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass);expr;
 26;EXPRTest.at:71;expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass);expr;
-27;EXPRTest.at:81;expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr;
-28;EXPRTest.at:84;expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr;
+27;EXPRTest.at:80;expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr;
+28;EXPRTest.at:83;expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass);expr;
 29;EXPRTest.at:89;expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass);expr;
 30;EXPRTest.at:89;expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass);expr;
 31;EXPRTest.at:91;expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass);expr;
@@ -721,14 +758,12 @@ at_help_all="1;EXPRTest.at:57;expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k
 129;EXPRTest.at:154;expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass);expr;
 130;EXPRTest.at:154;expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass);expr;
 "
-# List of the all the test groups.
-at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
 
-# at_fn_validate_ranges NAME...
-# -----------------------------
-# Validate and normalize the test group number contained in each variable
-# NAME. Leading zeroes are treated as decimal.
-at_fn_validate_ranges ()
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME.  Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
 {
   for at_grp
   do
@@ -739,7 +774,7 @@ at_fn_validate_ranges ()
     fi
     case $at_value in
       0*) # We want to treat leading 0 as decimal, like expr and test, but
-	  # AS_VAR_ARITH treats it as octal if it uses $(( )).
+	  # at_func_arith treats it as octal if it uses $(( )).
 	  # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
 	  # expr fork, but it is not worth the effort to determine if the
 	  # shell supports XSI when the user can just avoid leading 0.
@@ -765,8 +800,8 @@ do
   fi
 
   case $at_option in
-  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
-  *)    at_optarg= ;;
+  *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
+  *)   at_optarg= ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -788,19 +823,6 @@ do
 	at_clean=:
 	;;
 
-    --color )
-	at_color=always
-	;;
-    --color=* )
-	case $at_optarg in
-	no | never | none) at_color=never ;;
-	auto | tty | if-tty) at_color=auto ;;
-	always | yes | force) at_color=always ;;
-	*) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
-	   as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
-	esac
-	;;
-
     --debug | -d )
 	at_debug_p=:
 	;;
@@ -815,31 +837,29 @@ do
 	;;
 
     --trace | -x )
-	at_traceon='set -x'
-	at_trace_echo=echo
-	at_check_filter_trace=at_fn_filter_trace
+	at_traceon='set -x'; at_traceoff='set +x'
 	;;
 
     [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
-	at_fn_validate_ranges at_option
-	as_fn_append at_groups "$at_option$as_nl"
+	at_func_validate_ranges at_option
+	at_groups="$at_groups$at_option "
 	;;
 
     # Ranges
     [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
 	at_range_start=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_start
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,$p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.* \('$at_range_start' \)/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
 	at_range_end=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '1,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -855,10 +875,11 @@ do
 	  at_range_end=$at_range_start
 	  at_range_start=$at_tmp
 	fi
-	at_fn_validate_ranges at_range_start at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.*\( '$at_range_start' \)/\1/' \
+	      -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     # Directory selection.
@@ -868,25 +889,6 @@ do
     --directory=* )
 	at_change_dir=:
 	at_dir=$at_optarg
-	if test x- = "x$at_dir" ; then
-	  at_dir=./-
-	fi
-	;;
-
-    # Parallel execution.
-    --jobs | -j )
-	at_jobs=0
-	;;
-    --jobs=* | -j[0-9]* )
-	if test -n "$at_optarg"; then
-	  at_jobs=$at_optarg
-	else
-	  at_jobs=`expr X$at_option : 'X-j\(.*\)'`
-	fi
-	case $at_jobs in *[!0-9]*)
-	  at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
-	  as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
-	esac
 	;;
 
     # Keywords.
@@ -913,12 +915,11 @@ do
 	  at_groups_selected=`$as_echo "$at_groups_selected" |
 	      grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
 	done
-	# Smash the keywords.
-	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-	as_fn_append at_groups "$at_groups_selected$as_nl"
-	;;
-    --recheck)
-	at_recheck=:
+	# Smash the newlines.
+	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+	  tr "$as_nl" ' '
+	`
+	at_groups="$at_groups$at_groups_selected "
 	;;
     --baselines )
 	at_prev=--baselines
@@ -936,12 +937,14 @@ do
 	# Reject names that are not valid shell variable names.
 	case $at_envvar in
 	  '' | [0-9]* | *[!_$as_cr_alnum]* )
-	    as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
+	    { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+   { (exit 1); exit 1; }; } ;;
 	esac
 	at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
 	# Export now, but save eval for later and for debug scripts.
 	export $at_envvar
-	as_fn_append at_debug_args " $at_envvar='$at_value'"
+	at_debug_args="$at_debug_args $at_envvar='$at_value'"
 	;;
 
      *) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -952,54 +955,32 @@ do
 done
 
 # Verify our last option didn't require an argument
-if test -n "$at_prev"; then :
-  as_fn_error $? "\`$at_prev' requires an argument"
+if test -n "$at_prev"; then
+  { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
 
 # Selected test groups.
-if test -z "$at_groups$at_recheck"; then
+if test -z "$at_groups"; then
   at_groups=$at_groups_all
 else
-  if test -n "$at_recheck" && test -r "$at_suite_log"; then
-    at_oldfails=`sed -n '
-      /^Failed tests:$/,/^Skipped tests:$/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^Unexpected passes:$/,/^## Detailed failed tests/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^## Detailed failed tests/q
-      ' "$at_suite_log"`
-    as_fn_append at_groups "$at_oldfails$as_nl"
-  fi
   # Sort the tests, removing duplicates.
-  at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
-fi
-
-if test x"$at_color" = xalways \
-   || { test x"$at_color" = xauto && test -t 1; }; then
-  at_red=`printf '\033[0;31m'`
-  at_grn=`printf '\033[0;32m'`
-  at_lgn=`printf '\033[1;32m'`
-  at_blu=`printf '\033[1;34m'`
-  at_std=`printf '\033[m'`
-else
-  at_red= at_grn= at_lgn= at_blu= at_std=
+  at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
 fi
 
 ##
 ## Process package specific options when _not_ supplied.
 ##
 
-if $at_arg_given_baselines; then :
-
+if $at_arg_given_baselines; then
+  :
 else
   baselines=
 fi
 
+
 # Help message.
 if $at_help_p; then
   cat <<_ATEOF || at_write_fail=1
@@ -1008,17 +989,16 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
 Run all the tests, or the selected TESTS, given by numeric ranges, and
 save a detailed log file.  Upon failure, create debugging scripts.
 
-Do not change environment variables directly.  Instead, set them via
-command line arguments.  Set \`AUTOTEST_PATH' to select the executables
+You should not change environment variables unless explicitly passed
+as command line arguments.  Set \`AUTOTEST_PATH' to select the executables
 to exercise.  Each relative directory is expanded as build and source
-directories relative to the top level of this distribution.
-E.g., from within the build directory /tmp/foo-1.0, invoking this:
+directories relatively to the top level of this distribution.  E.g.,
 
   $ $0 AUTOTEST_PATH=bin
 
-is equivalent to the following, assuming the source directory is /src/foo-1.0:
+possibly amounts into
 
-  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
 _ATEOF
 cat <<_ATEOF || at_write_fail=1
 
@@ -1033,14 +1013,9 @@ cat <<_ATEOF || at_write_fail=1
 Execution tuning:
   -C, --directory=DIR
                  change to directory DIR before starting
-      --color[=never|auto|always]
-                 enable colored test results on terminal, or always
-  -j, --jobs[=N]
-                 Allow N jobs at once; infinite jobs with no arg (default 1)
   -k, --keywords=KEYWORDS
                  select the tests matching all the comma-separated KEYWORDS
                  multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-      --recheck  select all tests that failed or passed unexpectedly last time
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
                  default for debugging scripts
@@ -1066,69 +1041,64 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-libdap 3.18.1 test suite: expr-test test groups:
+libdap 3.18.2 test suite: expr-test test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
-  # Pass an empty line as separator between selected groups and help.
-  $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-    awk 'NF == 1 && FS != ";" {
-	   selected[$ 1] = 1
+  # Passing at_groups is tricky.  We cannot use it to form a literal string
+  # or regexp because of the limitation of AIX awk.  And Solaris' awk
+  # doesn't grok more than 99 fields in a record, so we have to use `split'.
+  # at_groups needs to be space-separated for this script to work.
+  case $at_groups in
+    *"$as_nl"* )
+      at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+  esac
+  $as_echo "$at_groups$as_nl$at_help_all" |
+    awk 'BEGIN { FS = ";" }
+	 NR == 1 {
+	   for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
 	   next
 	 }
-	 /^$/ { FS = ";" }
-	 NF > 0 {
+	 {
 	   if (selected[$ 1]) {
 	     printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-	     if ($ 4) {
-	       lmax = 79
-	       indent = "     "
-	       line = indent
-	       len = length (line)
-	       n = split ($ 4, a, " ")
-	       for (i = 1; i <= n; i++) {
-		 l = length (a[i]) + 1
-		 if (i > 1 && len + l > lmax) {
-		   print line
-		   line = indent " " a[i]
-		   len = length (line)
-		 } else {
-		   line = line " " a[i]
-		   len += l
-		 }
-	       }
-	       if (n)
-		 print line
-	     }
+	     if ($ 4) printf "      %s\n", $ 4
 	   }
 	 }' || at_write_fail=1
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (libdap 3.18.1)" &&
-  cat <<\_ATEOF || at_write_fail=1
+  $as_echo "$as_me (libdap 3.18.2)" &&
+  cat <<\_ACEOF || at_write_fail=1
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
-_ATEOF
+_ACEOF
   exit $at_write_fail
 fi
 
-# Should we print banners?  Yes if more than one test is run.
-case $at_groups in #(
-  *$as_nl* )
-      at_print_banners=: ;; #(
+# Should we print banners?  at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+  *' '*' '* | *"$as_nl"*"$as_nl"* )
+      at_print_banners=: ;;
   * ) at_print_banners=false ;;
 esac
-# Text for banner N, set to a single space once printed.
+# Text for banner N, set to empty once printed.
 
 # Take any -C into account.
 if $at_change_dir ; then
+  if test x- = "x$at_dir" ; then
+    at_dir=./-
+  fi
   test x != "x$at_dir" && cd "$at_dir" \
-    || as_fn_error $? "unable to change directory"
+    || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+   { (exit 1); exit 1; }; }
   at_dir=`pwd`
 fi
 
@@ -1136,11 +1106,13 @@ fi
 for at_file in atconfig atlocal
 do
   test -r $at_file || continue
-  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+  . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+   { (exit 1); exit 1; }; }
 done
 
 # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: "${at_top_build_prefix=$at_top_builddir}"
+: ${at_top_build_prefix=$at_top_builddir}
 
 # Perform any assignments requested during argument parsing.
 eval "$at_debug_args"
@@ -1151,7 +1123,8 @@ if test -n "$at_top_srcdir"; then
   builddir=../..
   for at_dir_var in srcdir top_srcdir top_build_prefix
   do
-    eval at_val=\$at_$at_dir_var
+    at_val=`eval 'as_val=${'at_$at_dir_var'}
+		 $as_echo "$as_val"'`
     case $at_val in
       [\\/$]* | ?:[\\/]* ) at_prefix= ;;
       *) at_prefix=../../ ;;
@@ -1160,9 +1133,9 @@ if test -n "$at_top_srcdir"; then
   done
 fi
 
-## -------------------- ##
-## Directory structure. ##
-## -------------------- ##
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
 
 # This is the set of directories and files used by this script
 # (non-literals are capitalized):
@@ -1193,14 +1166,12 @@ fi
 # The directory the whole suite works in.
 # Should be absolute to let the user `cd' at will.
 at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite ($at_dir might have changed since earlier).
+# The file containing the suite.
 at_suite_log=$at_dir/$as_me.log
 # The directory containing helper files per test group.
 at_helper_dir=$at_suite_dir/at-groups
 # Stop file: if it exists, do not start new jobs.
 at_stop_file=$at_suite_dir/at-stop
-# The fifo used for the job dispatcher.
-at_job_fifo=$at_suite_dir/at-job-fifo
 
 if $at_clean; then
   test -d "$at_suite_dir" &&
@@ -1224,23 +1195,23 @@ for as_dir in $AUTOTEST_PATH $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
+  test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
 case $as_dir in
   [\\/]* | ?:[\\/]* )
-    as_fn_append at_path "$as_dir"
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_build_prefix"; then
       # Stand-alone test suite.
-      as_fn_append at_path "$as_dir"
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
-      as_fn_append at_path "$at_top_srcdir/$as_dir"
+      at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 
@@ -1254,7 +1225,7 @@ for as_dir in $at_path
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -d "$as_dir" || continue
+  test -d "$as_dir" || continue
 case $as_dir in
   [\\/]* | ?:[\\/]* ) ;;
   * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1262,18 +1233,15 @@ esac
 case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
   *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
   $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
-  *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
+  *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-
-
-
 # 5 is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
@@ -1283,28 +1251,43 @@ fi
 exec 5>>"$at_suite_log"
 
 # Banners and logs.
-$as_echo "## ------------------------------------ ##
-## libdap 3.18.1 test suite: expr-test. ##
-## ------------------------------------ ##"
+cat <<\_ASBOX
+## ------------------------------------ ##
+## libdap 3.18.2 test suite: expr-test. ##
+## ------------------------------------ ##
+_ASBOX
 {
-  $as_echo "## ------------------------------------ ##
-## libdap 3.18.1 test suite: expr-test. ##
-## ------------------------------------ ##"
+  cat <<\_ASBOX
+## ------------------------------------ ##
+## libdap 3.18.2 test suite: expr-test. ##
+## ------------------------------------ ##
+_ASBOX
   echo
 
   $as_echo "$as_me: command line was:"
   $as_echo "  \$ $0 $at_cli_args"
   echo
 
-  # If ChangeLog exists, list a few lines in case it might help determining
-  # the exact version.
-  if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
-    $as_echo "## ---------- ##
-## ChangeLog. ##
-## ---------- ##"
-    echo
-    sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
+  # Try to find a few ChangeLogs in case it might help determining the
+  # exact version.  Use the relative dir: if the top dir is a symlink,
+  # find will not follow it (and options to follow the links are not
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
+  if test -n "$at_top_srcdir"; then
+    cat <<\_ASBOX
+## ----------- ##
+## ChangeLogs. ##
+## ----------- ##
+_ASBOX
     echo
+    for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
+    do
+      $as_echo "$as_me: $at_file:"
+      sed 's/^/| /;10q' $at_file
+      echo
+    done
+
   fi
 
   {
@@ -1337,8 +1320,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 }
@@ -1355,80 +1338,53 @@ IFS=$as_save_IFS
 } >&5
 
 
-## ------------------------- ##
-## Autotest shell functions. ##
-## ------------------------- ##
+## --------------- ##
+## Shell functions ##
+## --------------- ##
 
-# at_fn_banner NUMBER
-# -------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups and
-# this particular banner has not yet been printed.
-at_fn_banner ()
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
 {
   $at_print_banners || return 0
   eval at_banner_text=\$at_banner_text_$1
-  test "x$at_banner_text" = "x " && return 0
-  eval "at_banner_text_$1=\" \""
-  if test -z "$at_banner_text"; then
-    $at_first || echo
-  else
-    $as_echo "$as_nl$at_banner_text$as_nl"
-  fi
-} # at_fn_banner
-
-# at_fn_check_prepare_notrace REASON LINE
-# ---------------------------------------
-# Perform AT_CHECK preparations for the command at LINE for an untraceable
-# command; REASON is the reason for disabling tracing.
-at_fn_check_prepare_notrace ()
-{
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
-  $as_echo "$2" >"$at_check_line_file"
-  at_check_trace=: at_check_filter=:
-  : >"$at_stdout"; : >"$at_stderr"
-}
+  test "x$at_banner_text" = x && return 0
+  eval at_banner_text_$1=
+  $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
 
-# at_fn_check_prepare_trace LINE
-# ------------------------------
-# Perform AT_CHECK preparations for the command at LINE for a traceable
-# command.
-at_fn_check_prepare_trace ()
-{
-  $as_echo "$1" >"$at_check_line_file"
-  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
-  : >"$at_stdout"; : >"$at_stderr"
-}
-
-# at_fn_check_prepare_dynamic COMMAND LINE
-# ----------------------------------------
-# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
-# preparation function.
-at_fn_check_prepare_dynamic ()
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
 {
-  case $1 in
-    *$as_nl*)
-      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
-    *)
-      at_fn_check_prepare_trace "$2" ;;
+  case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+    return 1 ;;
+ *) return 0 ;;
   esac
 }
 
-# at_fn_filter_trace
-# ------------------
-# Remove the lines in the file "$at_stderr" generated by "set -x" and print
-# them to stderr.
-at_fn_filter_trace ()
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr").  Return the exit code EXIT-CODE.
+at_func_filter_trace ()
 {
-  mv "$at_stderr" "$at_stder1"
   grep '^ *+' "$at_stder1" >&2
   grep -v '^ *+' "$at_stder1" >"$at_stderr"
+  return $1
 }
 
-# at_fn_log_failure FILE-LIST
-# ---------------------------
+# at_func_log_failure FILE-LIST
+# -----------------------------
 # Copy the files in the list on stdout with a "> " prefix, and exit the shell
 # with a failure exit code.
-at_fn_log_failure ()
+at_func_log_failure ()
 {
   for file
     do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1436,62 +1392,56 @@ at_fn_log_failure ()
   exit 1
 }
 
-# at_fn_check_skip EXIT-CODE LINE
-# -------------------------------
-# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
-# the test group subshell with that same exit code. Use LINE in any report
-# about test failure.
-at_fn_check_skip ()
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
 {
   case $1 in
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$2: hard failure"; exit 99;;
     77) echo 77 > "$at_status_file"; exit 77;;
   esac
 }
 
-# at_fn_check_status EXPECTED EXIT-CODE LINE
-# ------------------------------------------
-# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
-# Otherwise, if it is 77 or 99, exit the test group subshell with that same
-# exit code; if it is anything else print an error message referring to LINE,
-# and fail the test.
-at_fn_check_status ()
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
 {
   case $2 in
     $1 ) ;;
     77) echo 77 > "$at_status_file"; exit 77;;
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$3: hard failure"; exit 99;;
     *) $as_echo "$3: exit code was $2, expected $1"
       at_failed=:;;
   esac
 }
 
-# at_fn_diff_devnull FILE
-# -----------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
-# invocations.
-at_fn_diff_devnull ()
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE.  Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
 {
   test -s "$1" || return 0
   $at_diff "$at_devnull" "$1"
 }
 
-# at_fn_test NUMBER
-# -----------------
+# at_func_test NUMBER
+# -------------------
 # Parse out test NUMBER from the tail of this file.
-at_fn_test ()
+at_func_test ()
 {
   eval at_sed=\$at_sed$1
   sed "$at_sed" "$at_myself" > "$at_test_source"
 }
 
-# at_fn_create_debugging_script
-# -----------------------------
+# at_func_create_debugging_script
+# -------------------------------
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
-at_fn_create_debugging_script ()
+at_func_create_debugging_script ()
 {
   {
     echo "#! /bin/sh" &&
@@ -1503,13 +1453,34 @@ at_fn_create_debugging_script ()
   chmod +x "$at_group_dir/run"
 }
 
-## -------------------------------- ##
-## End of autotest shell functions. ##
-## -------------------------------- ##
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.  The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  # With "$@", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $* ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "$@"`
+  }
+fi
+
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
 {
-  $as_echo "## ---------------- ##
+  cat <<\_ASBOX
+## ---------------- ##
 ## Tested programs. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1517,35 +1488,34 @@ at_fn_create_debugging_script ()
 for at_program in : $at_tested
 do
   test "$at_program" = : && continue
-  case $at_program in
-    [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
-    * )
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -f "$as_dir/$at_program" && break
-  done
+  test -f "$as_dir/$at_program" && break
+done
 IFS=$as_save_IFS
 
-    at_program_=$as_dir/$at_program ;;
-  esac
-  if test -f "$at_program_"; then
+  if test -f "$as_dir/$at_program"; then
     {
-      $as_echo "$at_srcdir/EXPRTest.at:3: $at_program_ --version"
-      "$at_program_" --version </dev/null
+      $as_echo "$at_srcdir/EXPRTest.at:3: $as_dir/$at_program --version"
+      "$as_dir/$at_program" --version </dev/null
       echo
     } >&5 2>&1
   else
-    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 done
 
 {
-  $as_echo "## ------------------ ##
+  cat <<\_ASBOX
+## ------------------ ##
 ## Running the tests. ##
-## ------------------ ##"
+## ------------------ ##
+_ASBOX
 } >&5
 
 at_start_date=`date`
@@ -1553,8 +1523,11 @@ at_start_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: starting at: $at_start_date" >&5
 
 # Create the master directory if it doesn't already exist.
-as_dir="$at_suite_dir"; as_fn_mkdir_p ||
-  as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
+test -d "$at_suite_dir" ||
+  mkdir "$at_suite_dir" ||
+  { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
 if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1588,40 +1561,28 @@ BEGIN { FS="" }
   if (test == "'"$at_group"'") exit
 }' "$at_myself" > "$at_suite_dir/at-source-lines" &&
 . "$at_suite_dir/at-source-lines" ||
-  as_fn_error $? "cannot create test line number cache" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+   { (exit 1); exit 1; }; }
 rm -f "$at_suite_dir/at-source-lines"
 
-# Set number of jobs for `-j'; avoid more jobs than test groups.
-set X $at_groups; shift; at_max_jobs=$#
-if test $at_max_jobs -eq 0; then
-  at_jobs=1
-fi
-if test $at_jobs -ne 1 &&
-   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
-  at_jobs=$at_max_jobs
-fi
-
-# If parallel mode, don't output banners, don't split summary lines.
-if test $at_jobs -ne 1; then
-  at_print_banners=false
-  at_quiet=:
-fi
-
 # Set up helper dirs.
 rm -rf "$at_helper_dir" &&
 mkdir "$at_helper_dir" &&
 cd "$at_helper_dir" &&
 { test -z "$at_groups" || mkdir $at_groups; } ||
-as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Functions for running a test group.  We leave the actual
 # test group execution outside of a shell function in order
 # to avoid hitting zsh 4.x exit status bugs.
 
-# at_fn_group_prepare
-# -------------------
-# Prepare for running a test group.
-at_fn_group_prepare ()
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
 {
   # The directory for additional per-group helper files.
   at_job_dir=$at_helper_dir/$at_group
@@ -1655,20 +1616,56 @@ at_fn_group_prepare ()
 
 
   # Create a fresh directory for the next test group, and enter.
-  # If one already exists, the user may have invoked ./run from
-  # within that directory; we remove the contents, but not the
-  # directory itself, so that we aren't pulling the rug out from
-  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
-  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
-  rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
-fi ||
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+    find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+    rm -fr "$at_group_dir" ||
+    { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+  fi
   # Be tolerant if the above `rm' was not able to remove the directory.
-  as_dir="$at_group_dir"; as_fn_mkdir_p
+  { as_dir="$at_group_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
   echo 0 > "$at_status_file"
 
@@ -1681,29 +1678,9 @@ $as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be
   fi
 }
 
-# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
-# -------------------------------------------------
-# Declare the test group ORDINAL, located at LINE with group description DESC,
-# and residing under BANNER. Use PAD to align the status column.
-at_fn_group_banner ()
-{
-  at_setup_line="$2"
-  test -n "$5" && at_fn_banner $5
-  at_desc="$3"
-  case $1 in
-    [0-9])      at_desc_line="  $1: ";;
-    [0-9][0-9]) at_desc_line=" $1: " ;;
-    *)          at_desc_line="$1: "  ;;
-  esac
-  as_fn_append at_desc_line "$3$4"
-  $at_quiet $as_echo_n "$at_desc_line"
-  echo "#                             -*- compilation -*-" >> "$at_group_log"
-}
-
-# at_fn_group_postprocess
-# -----------------------
-# Perform cleanup after running a test group.
-at_fn_group_postprocess ()
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
 {
   # Be sure to come back to the suite directory, in particular
   # since below we might `rm' the group directory we are in currently.
@@ -1716,7 +1693,6 @@ at_fn_group_postprocess ()
       report this failure to <opendap-tech at opendap.org>.
 _ATEOF
     $as_echo "$at_setup_line" >"$at_check_line_file"
-    at_status=99
   fi
   $at_verbose $as_echo_n "$at_group. $at_setup_line: "
   $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1725,41 +1701,31 @@ _ATEOF
 	at_msg="UNEXPECTED PASS"
 	at_res=xpass
 	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     no:0)
 	at_msg="ok"
 	at_res=pass
 	at_errexit=false
-	at_color=$at_grn
 	;;
     *:77)
 	at_msg='skipped ('`cat "$at_check_line_file"`')'
 	at_res=skip
 	at_errexit=false
-	at_color=$at_blu
-	;;
-    no:* | *:99)
-	at_msg='FAILED ('`cat "$at_check_line_file"`')'
-	at_res=fail
-	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     yes:*)
 	at_msg='expected failure ('`cat "$at_check_line_file"`')'
 	at_res=xfail
 	at_errexit=false
-	at_color=$at_lgn
+	;;
+    no:*)
+	at_msg='FAILED ('`cat "$at_check_line_file"`')'
+	at_res=fail
+	at_errexit=$at_errexit_p
 	;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
-  # In parallel mode, output the summary line only afterwards.
-  if test $at_jobs -ne 1 && test -n "$at_verbose"; then
-    $as_echo "$at_desc_line $at_color$at_msg$at_std"
-  else
-    # Make sure there is a separator even with long titles.
-    $as_echo " $at_color$at_msg$at_std"
-  fi
+  # Make sure there is a separator even with long titles.
+  $as_echo " $at_msg"
   at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
   case $at_status in
     0|77)
@@ -1774,13 +1740,9 @@ _ATEOF
       $as_echo "$at_log_msg" >> "$at_group_log"
       $as_echo "$at_log_msg" >&5
 
-      # Cleanup the group directory, unless the user wants the files
-      # or the success was unexpected.
-      if $at_debug_p || test $at_res = xpass; then
-	at_fn_create_debugging_script
-	if test $at_res = xpass && $at_errexit; then
-	  echo stop > "$at_stop_file"
-	fi
+      # Cleanup the group directory, unless the user wants the files.
+      if $at_debug_p; then
+	at_func_create_debugging_script
       else
 	if test -d "$at_group_dir"; then
 	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1797,7 +1759,7 @@ _ATEOF
 
       # Upon failure, keep the group directory for autopsy, and create
       # the debugging script.  With -e, do not start any further tests.
-      at_fn_create_debugging_script
+      at_func_create_debugging_script
       if $at_errexit; then
 	echo stop > "$at_stop_file"
       fi
@@ -1810,134 +1772,22 @@ _ATEOF
 ## Driver loop. ##
 ## ------------ ##
 
-
-if (set -m && set +m && set +b) >/dev/null 2>&1; then
-  set +b
-  at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
-else
-  at_job_control_on=: at_job_control_off=: at_job_group=
-fi
-
-for at_signal in 1 2 15; do
-  trap 'set +x; set +e
-	$at_job_control_off
-	at_signal='"$at_signal"'
-	echo stop > "$at_stop_file"
-	trap "" $at_signal
-	at_pgids=
-	for at_pgid in `jobs -p 2>/dev/null`; do
-	  at_pgids="$at_pgids $at_job_group$at_pgid"
-	done
-	test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
-	wait
-	if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
-	  echo >&2
-	fi
-	at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
-	set x $at_signame
-	test 1 -gt 2 && at_signame=$at_signal
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
-$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
-	as_fn_arith 128 + $at_signal && exit_status=$as_val
-	as_fn_exit $exit_status' $at_signal
-done
-
 rm -f "$at_stop_file"
 at_first=:
 
-if test $at_jobs -ne 1 &&
-     rm -f "$at_job_fifo" &&
-     test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
-then
-  # FIFO job dispatcher.
-
-  trap 'at_pids=
-	for at_pid in `jobs -p`; do
-	  at_pids="$at_pids $at_job_group$at_pid"
-	done
-	if test -n "$at_pids"; then
-	  at_sig=TSTP
-	  test "${TMOUT+set}" = set && at_sig=STOP
-	  kill -$at_sig $at_pids 2>/dev/null
-	fi
-	kill -STOP $$
-	test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
-
-  echo
-  # Turn jobs into a list of numbers, starting from 1.
-  at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
-  set X $at_joblist
-  shift
-  for at_group in $at_groups; do
-    $at_job_control_on 2>/dev/null
-    (
-      # Start one test group.
-      $at_job_control_off
-      if $at_first; then
-	exec 7>"$at_job_fifo"
-      else
-	exec 6<&-
-      fi
-      trap 'set +x; set +e
-	    trap "" PIPE
-	    echo stop > "$at_stop_file"
-	    echo >&7
-	    as_fn_exit 141' PIPE
-      at_fn_group_prepare
-      if cd "$at_group_dir" &&
-	 at_fn_test $at_group &&
-	 . "$at_test_source"
-      then :; else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+for at_group in $at_groups; do
+  at_func_group_prepare
+  if cd "$at_group_dir" &&
+     at_func_test $at_group &&
+     . "$at_test_source"; then :; else
+    { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
 $as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-	at_failed=:
-      fi
-      at_fn_group_postprocess
-      echo >&7
-    ) &
-    $at_job_control_off
-    if $at_first; then
-      at_first=false
-      exec 6<"$at_job_fifo" 7>"$at_job_fifo"
-    fi
-    shift # Consume one token.
-    if test $# -gt 0; then :; else
-      read at_token <&6 || break
-      set x $*
-    fi
-    test -f "$at_stop_file" && break
-  done
-  exec 7>&-
-  # Read back the remaining ($at_jobs - 1) tokens.
-  set X $at_joblist
-  shift
-  if test $# -gt 0; then
-    shift
-    for at_job
-    do
-      read at_token
-    done <&6
+    at_failed=:
   fi
-  exec 6<&-
-  wait
-else
-  # Run serially, avoid forks and other potential surprises.
-  for at_group in $at_groups; do
-    at_fn_group_prepare
-    if cd "$at_group_dir" &&
-       at_fn_test $at_group &&
-       . "$at_test_source"; then :; else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
-$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-      at_failed=:
-    fi
-    at_fn_group_postprocess
-    test -f "$at_stop_file" && break
-    at_first=false
-  done
-fi
+  at_func_group_postprocess
+  test -f "$at_stop_file" && break
+  at_first=false
+done
 
 # Wrap up the test suite with summary statistics.
 cd "$at_helper_dir"
@@ -1958,9 +1808,12 @@ set X $at_xfail_list; shift; at_xfail_count=$#
 set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
 set X $at_skip_list; shift; at_skip_count=$#
 
-as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
-as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
-as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 # Back to the top directory.
 cd "$at_dir"
@@ -1972,26 +1825,35 @@ at_stop_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: ending at: $at_stop_date" >&5
 case $at_start_time,$at_stop_time in
   [0-9]*,[0-9]*)
-    as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
-    as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
-    as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
-    as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
-    as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     $as_echo "$as_me: test suite duration: $at_duration" >&5
     ;;
 esac
 
 echo
-$as_echo "## ------------- ##
+cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
 echo
 {
   echo
-  $as_echo "## ------------- ##
+  cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -2009,14 +1871,12 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
     at_result="$at_result $at_were run, one failed"
   fi
   at_result="$at_result unexpectedly and inhibited subsequent tests."
-  at_color=$at_red
 else
   # Don't you just love exponential explosion of the number of cases?
-  at_color=$at_red
   case $at_xpass_count:$at_fail_count:$at_xfail_count in
     # So far, so good.
-    0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
-    0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
+    0:0:0) at_result="$at_result $at_were successful." ;;
+    0:0:*) at_result="$at_result behaved as expected." ;;
 
     # Some unexpected failures
     0:*:0) at_result="$at_result $at_were run,
@@ -2062,16 +1922,18 @@ $at_skip_count tests were skipped." ;;
 esac
 
 if test $at_unexpected_count = 0; then
-  echo "$at_color$at_result$at_std"
+  echo "$at_result"
   echo "$at_result" >&5
 else
-  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&5
   {
     echo
-    $as_echo "## ------------------------ ##
+    cat <<\_ASBOX
+## ------------------------ ##
 ## Summary of the failures. ##
-## ------------------------ ##"
+## ------------------------ ##
+_ASBOX
 
     # Summary of failed and skipped tests.
     if test $at_fail_count != 0; then
@@ -2090,9 +1952,11 @@ else
       echo
     fi
     if test $at_fail_count != 0; then
-      $as_echo "## ---------------------- ##
+      cat <<\_ASBOX
+## ---------------------- ##
 ## Detailed failed tests. ##
-## ---------------------- ##"
+## ---------------------- ##
+_ASBOX
       echo
       for at_group in $at_fail_list
       do
@@ -2124,21 +1988,19 @@ _ASBOX
 _ASBOX
 
   echo
-  if $at_debug_p; then
-    at_msg='per-test log files'
-  else
-    at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
-  fi
-  $as_echo "Please send $at_msg and all information you think might help:
+  $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
 
    To: <opendap-tech at opendap.org>
-   Subject: [libdap 3.18.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point.  Its output may
-be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
+   Subject: [libdap 3.18.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 "
-  exit 1
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.  Its output may'
+    $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+    echo
+  fi
+    exit 1
 fi
 
 exit 0
@@ -2147,12 +2009,15 @@ exit 0
 ## Actual tests. ##
 ## ------------- ##
 #AT_START_1
-at_fn_group_banner 1 'EXPRTest.at:57' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i (pass)" ""
+# 1. EXPRTest.at:57: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i (pass)
+at_setup_line='EXPRTest.at:57'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i (pass)"
+$at_quiet $as_echo_n "  1: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $as_echo "1. EXPRTest.at:57: testing ..."
   $at_traceon
 
 
@@ -2164,79 +2029,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: mv stdout \$abs_srcdir/expr-testsuite/test.1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp" "EXPRTest.at:57"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr" "EXPRTest.at:57"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_1
 #AT_START_2
-at_fn_group_banner 2 'EXPRTest.at:57' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass)" ""
+# 2. EXPRTest.at:57: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i (pass)
+at_setup_line='EXPRTest.at:57'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i (pass)"
+$at_quiet $as_echo_n "  2: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "2. $at_setup_line: testing $at_desc ..."
+  $as_echo "2. EXPRTest.at:57: testing ..."
   $at_traceon
 
 
@@ -2248,79 +2145,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: mv stdout \$abs_srcdir/expr-testsuite/test.1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp" "EXPRTest.at:57"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true" "EXPRTest.at:57"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:57: diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr" "EXPRTest.at:57"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:57 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:57"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_2
 #AT_START_3
-at_fn_group_banner 3 'EXPRTest.at:58' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)" ""
+# 3. EXPRTest.at:58: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j (pass)
+at_setup_line='EXPRTest.at:58'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)"
+$at_quiet $as_echo_n "  3: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "3. $at_setup_line: testing $at_desc ..."
+  $as_echo "3. EXPRTest.at:58: testing ..."
   $at_traceon
 
 
@@ -2332,79 +2261,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: mv stdout \$abs_srcdir/expr-testsuite/test.1a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp" "EXPRTest.at:58"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr" "EXPRTest.at:58"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_3
 #AT_START_4
-at_fn_group_banner 4 'EXPRTest.at:58' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)" ""
+# 4. EXPRTest.at:58: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j (pass)
+at_setup_line='EXPRTest.at:58'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j (pass)"
+$at_quiet $as_echo_n "  4: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "4. $at_setup_line: testing $at_desc ..."
+  $as_echo "4. EXPRTest.at:58: testing ..."
   $at_traceon
 
 
@@ -2416,79 +2377,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: mv stdout \$abs_srcdir/expr-testsuite/test.1a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp" "EXPRTest.at:58"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true" "EXPRTest.at:58"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k i,j -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:58: diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr" "EXPRTest.at:58"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:58 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:58"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_4
 #AT_START_5
-at_fn_group_banner 5 'EXPRTest.at:59' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)" ""
+# 5. EXPRTest.at:59: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)
+at_setup_line='EXPRTest.at:59'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)"
+$at_quiet $as_echo_n "  5: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "5. $at_setup_line: testing $at_desc ..."
+  $as_echo "5. EXPRTest.at:59: testing ..."
   $at_traceon
 
 
@@ -2500,79 +2493,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: mv stdout \$abs_srcdir/expr-testsuite/test.1b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp" "EXPRTest.at:59"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr" "EXPRTest.at:59"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_5
 #AT_START_6
-at_fn_group_banner 6 'EXPRTest.at:59' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)" ""
+# 6. EXPRTest.at:59: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)
+at_setup_line='EXPRTest.at:59'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' (pass)"
+$at_quiet $as_echo_n "  6: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "6. $at_setup_line: testing $at_desc ..."
+  $as_echo "6. EXPRTest.at:59: testing ..."
   $at_traceon
 
 
@@ -2584,79 +2609,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: mv stdout \$abs_srcdir/expr-testsuite/test.1b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp" "EXPRTest.at:59"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true" "EXPRTest.at:59"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i,j&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:59: diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr" "EXPRTest.at:59"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:59 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:59"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_6
 #AT_START_7
-at_fn_group_banner 7 'EXPRTest.at:60' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)" ""
+# 7. EXPRTest.at:60: expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)
+at_setup_line='EXPRTest.at:60'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)"
+$at_quiet $as_echo_n "  7: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "7. $at_setup_line: testing $at_desc ..."
+  $as_echo "7. EXPRTest.at:60: testing ..."
   $at_traceon
 
 
@@ -2668,79 +2725,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: mv stdout \$abs_srcdir/expr-testsuite/test.1d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp" "EXPRTest.at:60"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr" "EXPRTest.at:60"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_7
 #AT_START_8
-at_fn_group_banner 8 'EXPRTest.at:60' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)" ""
+# 8. EXPRTest.at:60: expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)
+at_setup_line='EXPRTest.at:60'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' (pass)"
+$at_quiet $as_echo_n "  8: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "8. $at_setup_line: testing $at_desc ..."
+  $as_echo "8. EXPRTest.at:60: testing ..."
   $at_traceon
 
 
@@ -2752,79 +2841,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: mv stdout \$abs_srcdir/expr-testsuite/test.1d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp" "EXPRTest.at:60"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.1d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true" "EXPRTest.at:60"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.1 -k 'i&i=j' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:60: diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.1d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr" "EXPRTest.at:60"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:60 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.1d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:60"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_8
 #AT_START_9
-at_fn_group_banner 9 'EXPRTest.at:61' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
+# 9. EXPRTest.at:61: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 (pass)
+at_setup_line='EXPRTest.at:61'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)"
+$at_quiet $as_echo_n "  9: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "9. $at_setup_line: testing $at_desc ..."
+  $as_echo "9. EXPRTest.at:61: testing ..."
   $at_traceon
 
 
@@ -2836,79 +2957,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: mv stdout \$abs_srcdir/expr-testsuite/test.2.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp" "EXPRTest.at:61"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr" "EXPRTest.at:61"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_9
 #AT_START_10
-at_fn_group_banner 10 'EXPRTest.at:61' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)" ""
+# 10. EXPRTest.at:61: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 (pass)
+at_setup_line='EXPRTest.at:61'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 (pass)"
+$at_quiet $as_echo_n " 10: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $as_echo "10. EXPRTest.at:61: testing ..."
   $at_traceon
 
 
@@ -2920,79 +3073,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: mv stdout \$abs_srcdir/expr-testsuite/test.2.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp" "EXPRTest.at:61"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true" "EXPRTest.at:61"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s1 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:61: diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr" "EXPRTest.at:61"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:61 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:61"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_10
 #AT_START_11
-at_fn_group_banner 11 'EXPRTest.at:62' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
+# 11. EXPRTest.at:62: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 (pass)
+at_setup_line='EXPRTest.at:62'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)"
+$at_quiet $as_echo_n " 11: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $as_echo "11. EXPRTest.at:62: testing ..."
   $at_traceon
 
 
@@ -3004,79 +3189,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: mv stdout \$abs_srcdir/expr-testsuite/test.2a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp" "EXPRTest.at:62"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr" "EXPRTest.at:62"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_11
 #AT_START_12
-at_fn_group_banner 12 'EXPRTest.at:62' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)" ""
+# 12. EXPRTest.at:62: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 (pass)
+at_setup_line='EXPRTest.at:62'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 (pass)"
+$at_quiet $as_echo_n " 12: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $as_echo "12. EXPRTest.at:62: testing ..."
   $at_traceon
 
 
@@ -3088,79 +3305,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: mv stdout \$abs_srcdir/expr-testsuite/test.2a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp" "EXPRTest.at:62"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true" "EXPRTest.at:62"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:62: diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr" "EXPRTest.at:62"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:62 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:62"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_12
 #AT_START_13
-at_fn_group_banner 13 'EXPRTest.at:63' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)" ""
+# 13. EXPRTest.at:63: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)
+at_setup_line='EXPRTest.at:63'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)"
+$at_quiet $as_echo_n " 13: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $as_echo "13. EXPRTest.at:63: testing ..."
   $at_traceon
 
 
@@ -3172,79 +3421,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: mv stdout \$abs_srcdir/expr-testsuite/test.2b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp" "EXPRTest.at:63"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr" "EXPRTest.at:63"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_13
 #AT_START_14
-at_fn_group_banner 14 'EXPRTest.at:63' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)" ""
+# 14. EXPRTest.at:63: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)
+at_setup_line='EXPRTest.at:63'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 (pass)"
+$at_quiet $as_echo_n " 14: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $as_echo "14. EXPRTest.at:63: testing ..."
   $at_traceon
 
 
@@ -3256,79 +3537,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: mv stdout \$abs_srcdir/expr-testsuite/test.2b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp" "EXPRTest.at:63"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true" "EXPRTest.at:63"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2,s3 -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:63: diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr" "EXPRTest.at:63"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:63 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:63"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_14
 #AT_START_15
-at_fn_group_banner 15 'EXPRTest.at:64' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)" ""
+# 15. EXPRTest.at:64: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)
+at_setup_line='EXPRTest.at:64'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)"
+$at_quiet $as_echo_n " 15: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "15. $at_setup_line: testing $at_desc ..."
+  $as_echo "15. EXPRTest.at:64: testing ..."
   $at_traceon
 
 
@@ -3340,79 +3653,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: mv stdout \$abs_srcdir/expr-testsuite/test.2c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp" "EXPRTest.at:64"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr" "EXPRTest.at:64"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_15
 #AT_START_16
-at_fn_group_banner 16 'EXPRTest.at:64' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)" ""
+# 16. EXPRTest.at:64: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)
+at_setup_line='EXPRTest.at:64'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o (pass)"
+$at_quiet $as_echo_n " 16: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "16. $at_setup_line: testing $at_desc ..."
+  $as_echo "16. EXPRTest.at:64: testing ..."
   $at_traceon
 
 
@@ -3424,79 +3769,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: mv stdout \$abs_srcdir/expr-testsuite/test.2c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp" "EXPRTest.at:64"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true" "EXPRTest.at:64"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4],s3.o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:64: diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr" "EXPRTest.at:64"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:64 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:64"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_16
 #AT_START_17
-at_fn_group_banner 17 'EXPRTest.at:66' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)" ""
+# 17. EXPRTest.at:66: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)
+at_setup_line='EXPRTest.at:66'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)"
+$at_quiet $as_echo_n " 17: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "17. $at_setup_line: testing $at_desc ..."
+  $as_echo "17. EXPRTest.at:66: testing ..."
   $at_traceon
 
 
@@ -3508,79 +3885,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: mv stdout \$abs_srcdir/expr-testsuite/test.2d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp" "EXPRTest.at:66"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr" "EXPRTest.at:66"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_17
 #AT_START_18
-at_fn_group_banner 18 'EXPRTest.at:66' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)" ""
+# 18. EXPRTest.at:66: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)
+at_setup_line='EXPRTest.at:66'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m (pass)"
+$at_quiet $as_echo_n " 18: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "18. $at_setup_line: testing $at_desc ..."
+  $as_echo "18. EXPRTest.at:66: testing ..."
   $at_traceon
 
 
@@ -3592,79 +4001,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: mv stdout \$abs_srcdir/expr-testsuite/test.2d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp" "EXPRTest.at:66"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true" "EXPRTest.at:66"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:66: diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr" "EXPRTest.at:66"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:66 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:66"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_18
 #AT_START_19
-at_fn_group_banner 19 'EXPRTest.at:67' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)" ""
+# 19. EXPRTest.at:67: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)
+at_setup_line='EXPRTest.at:67'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)"
+$at_quiet $as_echo_n " 19: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "19. $at_setup_line: testing $at_desc ..."
+  $as_echo "19. EXPRTest.at:67: testing ..."
   $at_traceon
 
 
@@ -3676,79 +4117,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: mv stdout \$abs_srcdir/expr-testsuite/test.2e.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp" "EXPRTest.at:67"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr" "EXPRTest.at:67"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_19
 #AT_START_20
-at_fn_group_banner 20 'EXPRTest.at:67' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)" ""
+# 20. EXPRTest.at:67: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)
+at_setup_line='EXPRTest.at:67'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l (pass)"
+$at_quiet $as_echo_n " 20: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "20. $at_setup_line: testing $at_desc ..."
+  $as_echo "20. EXPRTest.at:67: testing ..."
   $at_traceon
 
 
@@ -3760,79 +4233,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: mv stdout \$abs_srcdir/expr-testsuite/test.2e.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp" "EXPRTest.at:67"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true" "EXPRTest.at:67"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k s2[2:2:4].m,s2[2:2:4].l -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:67: diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2e.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr" "EXPRTest.at:67"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:67 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2e.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:67"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_20
 #AT_START_21
-at_fn_group_banner 21 'EXPRTest.at:69' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)" ""
+# 21. EXPRTest.at:69: expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)
+at_setup_line='EXPRTest.at:69'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)"
+$at_quiet $as_echo_n " 21: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $as_echo "21. EXPRTest.at:69: testing ..."
   $at_traceon
 
 
@@ -3844,79 +4349,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: mv stdout \$abs_srcdir/expr-testsuite/test.2f.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp" "EXPRTest.at:69"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr" "EXPRTest.at:69"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_21
 #AT_START_22
-at_fn_group_banner 22 'EXPRTest.at:69' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)" ""
+# 22. EXPRTest.at:69: expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)
+at_setup_line='EXPRTest.at:69'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] (pass)"
+$at_quiet $as_echo_n " 22: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $as_echo "22. EXPRTest.at:69: testing ..."
   $at_traceon
 
 
@@ -3928,79 +4465,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: mv stdout \$abs_srcdir/expr-testsuite/test.2f.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp" "EXPRTest.at:69"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2f.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true" "EXPRTest.at:69"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2a -k s2[2:4].m[0:4],s2[2:4].l[0:5] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:69: diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2f.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr" "EXPRTest.at:69"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:69 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2f.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:69"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_22
 #AT_START_23
-at_fn_group_banner 23 'EXPRTest.at:70' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)" ""
+# 23. EXPRTest.at:70: expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)
+at_setup_line='EXPRTest.at:70'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)"
+$at_quiet $as_echo_n " 23: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "23. $at_setup_line: testing $at_desc ..."
+  $as_echo "23. EXPRTest.at:70: testing ..."
   $at_traceon
 
 
@@ -4012,79 +4581,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: mv stdout \$abs_srcdir/expr-testsuite/test.3.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp" "EXPRTest.at:70"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr" "EXPRTest.at:70"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_23
 #AT_START_24
-at_fn_group_banner 24 'EXPRTest.at:70' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)" ""
+# 24. EXPRTest.at:70: expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)
+at_setup_line='EXPRTest.at:70'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] (pass)"
+$at_quiet $as_echo_n " 24: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $as_echo "24. EXPRTest.at:70: testing ..."
   $at_traceon
 
 
@@ -4096,79 +4697,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: mv stdout \$abs_srcdir/expr-testsuite/test.3.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp" "EXPRTest.at:70"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true" "EXPRTest.at:70"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.3 -k i[1:10] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:70: diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.3.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr" "EXPRTest.at:70"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:70 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.3.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:70"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_24
 #AT_START_25
-at_fn_group_banner 25 'EXPRTest.at:71' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)" ""
+# 25. EXPRTest.at:71: expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' (pass)
+at_setup_line='EXPRTest.at:71'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)"
+$at_quiet $as_echo_n " 25: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $as_echo "25. EXPRTest.at:71: testing ..."
   $at_traceon
 
 
@@ -4180,79 +4813,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: mv stdout \$abs_srcdir/expr-testsuite/test.4.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp" "EXPRTest.at:71"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr" "EXPRTest.at:71"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_25
 #AT_START_26
-at_fn_group_banner 26 'EXPRTest.at:71' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)" ""
+# 26. EXPRTest.at:71: expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' (pass)
+at_setup_line='EXPRTest.at:71'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' (pass)"
+$at_quiet $as_echo_n " 26: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $as_echo "26. EXPRTest.at:71: testing ..."
   $at_traceon
 
 
@@ -4264,79 +4929,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: mv stdout \$abs_srcdir/expr-testsuite/test.4.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp" "EXPRTest.at:71"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true" "EXPRTest.at:71"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~\"^Silly.*\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.4 -k 's&s=~"^Silly.*"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:71: diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.4.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr" "EXPRTest.at:71"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:71 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.4.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:71"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_26
 #AT_START_27
-at_fn_group_banner 27 'EXPRTest.at:81' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)" ""
+# 27. EXPRTest.at:80: expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' (pass)
+at_setup_line='EXPRTest.at:80'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)"
+$at_quiet $as_echo_n " 27: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $as_echo "27. EXPRTest.at:80: testing ..."
   $at_traceon
 
 
@@ -4348,79 +5045,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:81: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:81"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:80: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
+echo EXPRTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:81: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:81"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:80: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
+echo EXPRTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:81: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:81"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:80: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
+echo EXPRTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:81: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:81"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:80: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr"
+echo EXPRTest.at:80 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:81"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:80"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_27
 #AT_START_28
-at_fn_group_banner 28 'EXPRTest.at:84' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)" ""
+# 28. EXPRTest.at:83: expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' (pass)
+at_setup_line='EXPRTest.at:83'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' (pass)"
+$at_quiet $as_echo_n " 28: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $as_echo "28. EXPRTest.at:83: testing ..."
   $at_traceon
 
 
@@ -4432,79 +5161,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
+
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:83: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
+echo EXPRTest.at:83 >"$at_check_line_file"
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:84: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:84"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:84: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp" "EXPRTest.at:84"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
-$at_failed && at_fn_log_failure
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:83: mv stdout \$abs_srcdir/expr-testsuite/test.ea.base.tmp"
+echo EXPRTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ea.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:84: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true" "EXPRTest.at:84"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:83: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"
+echo EXPRTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 3\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 3"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
-$as_echo "$at_srcdir/EXPRTest.at:84: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr" "EXPRTest.at:84"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+        { $at_traceoff
+$as_echo "$at_srcdir/EXPRTest.at:83: diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ea.base stderr"
+echo EXPRTest.at:83 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ea.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:84"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:83"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_28
 #AT_START_29
-at_fn_group_banner 29 'EXPRTest.at:89' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)" ""
+# 29. EXPRTest.at:89: expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' (pass)
+at_setup_line='EXPRTest.at:89'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)"
+$at_quiet $as_echo_n " 29: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $as_echo "29. EXPRTest.at:89: testing ..."
   $at_traceon
 
 
@@ -4516,79 +5277,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: mv stdout \$abs_srcdir/expr-testsuite/test.eb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp" "EXPRTest.at:89"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr" "EXPRTest.at:89"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_29
 #AT_START_30
-at_fn_group_banner 30 'EXPRTest.at:89' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)" ""
+# 30. EXPRTest.at:89: expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' (pass)
+at_setup_line='EXPRTest.at:89'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' (pass)"
+$at_quiet $as_echo_n " 30: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $as_echo "30. EXPRTest.at:89: testing ..."
   $at_traceon
 
 
@@ -4600,79 +5393,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: mv stdout \$abs_srcdir/expr-testsuite/test.eb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp" "EXPRTest.at:89"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.eb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true" "EXPRTest.at:89"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~\".*: 5\"' -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.e -k 'names.s&names.s=~".*: 5"' -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:89: diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.eb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr" "EXPRTest.at:89"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:89 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.eb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:89"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_30
 #AT_START_31
-at_fn_group_banner 31 'EXPRTest.at:91' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)" ""
+# 31. EXPRTest.at:91: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)
+at_setup_line='EXPRTest.at:91'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)"
+$at_quiet $as_echo_n " 31: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $as_echo "31. EXPRTest.at:91: testing ..."
   $at_traceon
 
 
@@ -4684,79 +5509,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: mv stdout \$abs_srcdir/expr-testsuite/test.5.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp" "EXPRTest.at:91"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr" "EXPRTest.at:91"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_31
 #AT_START_32
-at_fn_group_banner 32 'EXPRTest.at:91' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)" ""
+# 32. EXPRTest.at:91: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)
+at_setup_line='EXPRTest.at:91'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] (pass)"
+$at_quiet $as_echo_n " 32: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $as_echo "32. EXPRTest.at:91: testing ..."
   $at_traceon
 
 
@@ -4768,79 +5625,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: mv stdout \$abs_srcdir/expr-testsuite/test.5.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp" "EXPRTest.at:91"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true" "EXPRTest.at:91"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0][0] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:91: diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr" "EXPRTest.at:91"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:91 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:91"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_32
 #AT_START_33
-at_fn_group_banner 33 'EXPRTest.at:92' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)" ""
+# 33. EXPRTest.at:92: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)
+at_setup_line='EXPRTest.at:92'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)"
+$at_quiet $as_echo_n " 33: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $as_echo "33. EXPRTest.at:92: testing ..."
   $at_traceon
 
 
@@ -4852,79 +5741,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: mv stdout \$abs_srcdir/expr-testsuite/test.5a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp" "EXPRTest.at:92"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr" "EXPRTest.at:92"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_33
 #AT_START_34
-at_fn_group_banner 34 'EXPRTest.at:92' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)" ""
+# 34. EXPRTest.at:92: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)
+at_setup_line='EXPRTest.at:92'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] (pass)"
+$at_quiet $as_echo_n " 34: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $as_echo "34. EXPRTest.at:92: testing ..."
   $at_traceon
 
 
@@ -4936,79 +5857,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: mv stdout \$abs_srcdir/expr-testsuite/test.5a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp" "EXPRTest.at:92"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true" "EXPRTest.at:92"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[0:2:4][0:2:4][0:2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:92: diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr" "EXPRTest.at:92"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:92 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:92"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_34
 #AT_START_35
-at_fn_group_banner 35 'EXPRTest.at:93' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
+# 35. EXPRTest.at:93: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i (pass)
+at_setup_line='EXPRTest.at:93'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i (pass)"
+$at_quiet $as_echo_n " 35: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $as_echo "35. EXPRTest.at:93: testing ..."
   $at_traceon
 
 
@@ -5020,79 +5973,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: mv stdout \$abs_srcdir/expr-testsuite/test.6.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp" "EXPRTest.at:93"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr" "EXPRTest.at:93"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_35
 #AT_START_36
-at_fn_group_banner 36 'EXPRTest.at:93' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass)" ""
+# 36. EXPRTest.at:93: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i (pass)
+at_setup_line='EXPRTest.at:93'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i (pass)"
+$at_quiet $as_echo_n " 36: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $as_echo "36. EXPRTest.at:93: testing ..."
   $at_traceon
 
 
@@ -5104,79 +6089,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: mv stdout \$abs_srcdir/expr-testsuite/test.6.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp" "EXPRTest.at:93"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true" "EXPRTest.at:93"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:93: diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr" "EXPRTest.at:93"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:93 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:93"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_36
 #AT_START_37
-at_fn_group_banner 37 'EXPRTest.at:94' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)" ""
+# 37. EXPRTest.at:94: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)
+at_setup_line='EXPRTest.at:94'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)"
+$at_quiet $as_echo_n " 37: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "37. $at_setup_line: testing $at_desc ..."
+  $as_echo "37. EXPRTest.at:94: testing ..."
   $at_traceon
 
 
@@ -5188,79 +6205,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: mv stdout \$abs_srcdir/expr-testsuite/test.6a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp" "EXPRTest.at:94"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr" "EXPRTest.at:94"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_37
 #AT_START_38
-at_fn_group_banner 38 'EXPRTest.at:94' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)" ""
+# 38. EXPRTest.at:94: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)
+at_setup_line='EXPRTest.at:94'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] (pass)"
+$at_quiet $as_echo_n " 38: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "38. $at_setup_line: testing $at_desc ..."
+  $as_echo "38. EXPRTest.at:94: testing ..."
   $at_traceon
 
 
@@ -5272,79 +6321,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: mv stdout \$abs_srcdir/expr-testsuite/test.6a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp" "EXPRTest.at:94"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true" "EXPRTest.at:94"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:2][2:4] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:94: diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr" "EXPRTest.at:94"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:94 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:94"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_38
 #AT_START_39
-at_fn_group_banner 39 'EXPRTest.at:95' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)" ""
+# 39. EXPRTest.at:95: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)
+at_setup_line='EXPRTest.at:95'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)"
+$at_quiet $as_echo_n " 39: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "39. $at_setup_line: testing $at_desc ..."
+  $as_echo "39. EXPRTest.at:95: testing ..."
   $at_traceon
 
 
@@ -5356,79 +6437,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: mv stdout \$abs_srcdir/expr-testsuite/test.5b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp" "EXPRTest.at:95"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr" "EXPRTest.at:95"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_39
 #AT_START_40
-at_fn_group_banner 40 'EXPRTest.at:95' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)" ""
+# 40. EXPRTest.at:95: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)
+at_setup_line='EXPRTest.at:95'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] (pass)"
+$at_quiet $as_echo_n " 40: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "40. $at_setup_line: testing $at_desc ..."
+  $as_echo "40. EXPRTest.at:95: testing ..."
   $at_traceon
 
 
@@ -5440,79 +6553,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: mv stdout \$abs_srcdir/expr-testsuite/test.5b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp" "EXPRTest.at:95"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true" "EXPRTest.at:95"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.val[0:1][0:1][0:1] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:95: diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr" "EXPRTest.at:95"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:95 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:95"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_40
 #AT_START_41
-at_fn_group_banner 41 'EXPRTest.at:96' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)" ""
+# 41. EXPRTest.at:96: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length (pass)
+at_setup_line='EXPRTest.at:96'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)"
+$at_quiet $as_echo_n " 41: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "41. $at_setup_line: testing $at_desc ..."
+  $as_echo "41. EXPRTest.at:96: testing ..."
   $at_traceon
 
 
@@ -5524,79 +6669,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: mv stdout \$abs_srcdir/expr-testsuite/test.5c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp" "EXPRTest.at:96"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr" "EXPRTest.at:96"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_41
 #AT_START_42
-at_fn_group_banner 42 'EXPRTest.at:96' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)" ""
+# 42. EXPRTest.at:96: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length (pass)
+at_setup_line='EXPRTest.at:96'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length (pass)"
+$at_quiet $as_echo_n " 42: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "42. $at_setup_line: testing $at_desc ..."
+  $as_echo "42. EXPRTest.at:96: testing ..."
   $at_traceon
 
 
@@ -5608,79 +6785,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: mv stdout \$abs_srcdir/expr-testsuite/test.5c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp" "EXPRTest.at:96"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true" "EXPRTest.at:96"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:96: diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr" "EXPRTest.at:96"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:96 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:96"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_42
 #AT_START_43
-at_fn_group_banner 43 'EXPRTest.at:97' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)" ""
+# 43. EXPRTest.at:97: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)
+at_setup_line='EXPRTest.at:97'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)"
+$at_quiet $as_echo_n " 43: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "43. $at_setup_line: testing $at_desc ..."
+  $as_echo "43. EXPRTest.at:97: testing ..."
   $at_traceon
 
 
@@ -5692,79 +6901,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: mv stdout \$abs_srcdir/expr-testsuite/test.5d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp" "EXPRTest.at:97"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr" "EXPRTest.at:97"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_43
 #AT_START_44
-at_fn_group_banner 44 'EXPRTest.at:97' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)" ""
+# 44. EXPRTest.at:97: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)
+at_setup_line='EXPRTest.at:97'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width (pass)"
+$at_quiet $as_echo_n " 44: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "44. $at_setup_line: testing $at_desc ..."
+  $as_echo "44. EXPRTest.at:97: testing ..."
   $at_traceon
 
 
@@ -5776,79 +7017,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: mv stdout \$abs_srcdir/expr-testsuite/test.5d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp" "EXPRTest.at:97"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true" "EXPRTest.at:97"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g.length,g.width -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:97: diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr" "EXPRTest.at:97"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:97 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:97"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_44
 #AT_START_45
-at_fn_group_banner 45 'EXPRTest.at:98' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)" ""
+# 45. EXPRTest.at:98: expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o (pass)
+at_setup_line='EXPRTest.at:98'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)"
+$at_quiet $as_echo_n " 45: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "45. $at_setup_line: testing $at_desc ..."
+  $as_echo "45. EXPRTest.at:98: testing ..."
   $at_traceon
 
 
@@ -5860,79 +7133,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: mv stdout \$abs_srcdir/expr-testsuite/test.2g.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp" "EXPRTest.at:98"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr" "EXPRTest.at:98"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_45
 #AT_START_46
-at_fn_group_banner 46 'EXPRTest.at:98' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)" ""
+# 46. EXPRTest.at:98: expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o (pass)
+at_setup_line='EXPRTest.at:98'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o (pass)"
+$at_quiet $as_echo_n " 46: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "46. $at_setup_line: testing $at_desc ..."
+  $as_echo "46. EXPRTest.at:98: testing ..."
   $at_traceon
 
 
@@ -5944,79 +7249,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: mv stdout \$abs_srcdir/expr-testsuite/test.2g.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp" "EXPRTest.at:98"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.2g.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true" "EXPRTest.at:98"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.2 -k j,o -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:98: diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.2g.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr" "EXPRTest.at:98"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:98 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.2g.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:98"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_46
 #AT_START_47
-at_fn_group_banner 47 'EXPRTest.at:99' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)" ""
+# 47. EXPRTest.at:99: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" (pass)
+at_setup_line='EXPRTest.at:99'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)"
+$at_quiet $as_echo_n " 47: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "47. $at_setup_line: testing $at_desc ..."
+  $as_echo "47. EXPRTest.at:99: testing ..."
   $at_traceon
 
 
@@ -6028,79 +7365,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: mv stdout \$abs_srcdir/expr-testsuite/test.8.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp" "EXPRTest.at:99"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr" "EXPRTest.at:99"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_47
 #AT_START_48
-at_fn_group_banner 48 'EXPRTest.at:99' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)" ""
+# 48. EXPRTest.at:99: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" (pass)
+at_setup_line='EXPRTest.at:99'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" (pass)"
+$at_quiet $as_echo_n " 48: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "48. $at_setup_line: testing $at_desc ..."
+  $as_echo "48. EXPRTest.at:99: testing ..."
   $at_traceon
 
 
@@ -6112,79 +7481,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: mv stdout \$abs_srcdir/expr-testsuite/test.8.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp" "EXPRTest.at:99"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true" "EXPRTest.at:99"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%23i[0:2:9][0:2]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%23i[0:2:9][0:2]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:99: diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr" "EXPRTest.at:99"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:99 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:99"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_48
 #AT_START_49
-at_fn_group_banner 49 'EXPRTest.at:100' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)" ""
+# 49. EXPRTest.at:100: expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)
+at_setup_line='EXPRTest.at:100'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)"
+$at_quiet $as_echo_n " 49: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "49. $at_setup_line: testing $at_desc ..."
+  $as_echo "49. EXPRTest.at:100: testing ..."
   $at_traceon
 
 
@@ -6196,79 +7597,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: mv stdout \$abs_srcdir/expr-testsuite/test.7.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp" "EXPRTest.at:100"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr" "EXPRTest.at:100"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_49
 #AT_START_50
-at_fn_group_banner 50 'EXPRTest.at:100' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)" ""
+# 50. EXPRTest.at:100: expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)
+at_setup_line='EXPRTest.at:100'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f (pass)"
+$at_quiet $as_echo_n " 50: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "50. $at_setup_line: testing $at_desc ..."
+  $as_echo "50. EXPRTest.at:100: testing ..."
   $at_traceon
 
 
@@ -6280,79 +7713,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: mv stdout \$abs_srcdir/expr-testsuite/test.7.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp" "EXPRTest.at:100"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.7.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true" "EXPRTest.at:100"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.7 -k x,y,f -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:100: diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.7.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr" "EXPRTest.at:100"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:100 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.7.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.7.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:100"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_50
 #AT_START_51
-at_fn_group_banner 51 'EXPRTest.at:101' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)" ""
+# 51. EXPRTest.at:101: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" (pass)
+at_setup_line='EXPRTest.at:101'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)"
+$at_quiet $as_echo_n " 51: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "51. $at_setup_line: testing $at_desc ..."
+  $as_echo "51. EXPRTest.at:101: testing ..."
   $at_traceon
 
 
@@ -6364,79 +7829,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: mv stdout \$abs_srcdir/expr-testsuite/test.8a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp" "EXPRTest.at:101"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr" "EXPRTest.at:101"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_51
 #AT_START_52
-at_fn_group_banner 52 'EXPRTest.at:101' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)" ""
+# 52. EXPRTest.at:101: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" (pass)
+at_setup_line='EXPRTest.at:101'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" (pass)"
+$at_quiet $as_echo_n " 52: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "52. $at_setup_line: testing $at_desc ..."
+  $as_echo "52. EXPRTest.at:101: testing ..."
   $at_traceon
 
 
@@ -6448,79 +7945,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: mv stdout \$abs_srcdir/expr-testsuite/test.8a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp" "EXPRTest.at:101"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true" "EXPRTest.at:101"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"x%23y,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "x%23y,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:101: diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr" "EXPRTest.at:101"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:101 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:101"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_52
 #AT_START_53
-at_fn_group_banner 53 'EXPRTest.at:102' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)" ""
+# 53. EXPRTest.at:102: expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" (pass)
+at_setup_line='EXPRTest.at:102'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)"
+$at_quiet $as_echo_n " 53: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "53. $at_setup_line: testing $at_desc ..."
+  $as_echo "53. EXPRTest.at:102: testing ..."
   $at_traceon
 
 
@@ -6532,79 +8061,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: mv stdout \$abs_srcdir/expr-testsuite/test.8b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp" "EXPRTest.at:102"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr" "EXPRTest.at:102"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_53
 #AT_START_54
-at_fn_group_banner 54 'EXPRTest.at:102' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)" ""
+# 54. EXPRTest.at:102: expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" (pass)
+at_setup_line='EXPRTest.at:102'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" (pass)"
+$at_quiet $as_echo_n " 54: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "54. $at_setup_line: testing $at_desc ..."
+  $as_echo "54. EXPRTest.at:102: testing ..."
   $at_traceon
 
 
@@ -6616,79 +8177,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: mv stdout \$abs_srcdir/expr-testsuite/test.8b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp" "EXPRTest.at:102"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.8b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true" "EXPRTest.at:102"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k \"data%20name,y\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.8 -k "data%20name,y" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:102: diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.8b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr" "EXPRTest.at:102"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:102 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.8b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:102"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_54
 #AT_START_55
-at_fn_group_banner 55 'EXPRTest.at:103' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)" ""
+# 55. EXPRTest.at:103: expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" (pass)
+at_setup_line='EXPRTest.at:103'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)"
+$at_quiet $as_echo_n " 55: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "55. $at_setup_line: testing $at_desc ..."
+  $as_echo "55. EXPRTest.at:103: testing ..."
   $at_traceon
 
 
@@ -6700,79 +8293,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: mv stdout \$abs_srcdir/expr-testsuite/test.9.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp" "EXPRTest.at:103"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr" "EXPRTest.at:103"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_55
 #AT_START_56
-at_fn_group_banner 56 'EXPRTest.at:103' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)" ""
+# 56. EXPRTest.at:103: expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" (pass)
+at_setup_line='EXPRTest.at:103'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" (pass)"
+$at_quiet $as_echo_n " 56: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "56. $at_setup_line: testing $at_desc ..."
+  $as_echo "56. EXPRTest.at:103: testing ..."
   $at_traceon
 
 
@@ -6784,79 +8409,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: mv stdout \$abs_srcdir/expr-testsuite/test.9.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp" "EXPRTest.at:103"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.9.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true" "EXPRTest.at:103"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k \"Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.9 -k "Data-Set-2.fakeDim0[0:3],Data-Set-2.fakeDim1[0:3]" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:103: diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.9.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr" "EXPRTest.at:103"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:103 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.9.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.9.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:103"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_56
 #AT_START_57
-at_fn_group_banner 57 'EXPRTest.at:104' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)" ""
+# 57. EXPRTest.at:104: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)
+at_setup_line='EXPRTest.at:104'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)"
+$at_quiet $as_echo_n " 57: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "57. $at_setup_line: testing $at_desc ..."
+  $as_echo "57. EXPRTest.at:104: testing ..."
   $at_traceon
 
 
@@ -6868,79 +8525,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: mv stdout \$abs_srcdir/expr-testsuite/test.5e.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp" "EXPRTest.at:104"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr" "EXPRTest.at:104"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_57
 #AT_START_58
-at_fn_group_banner 58 'EXPRTest.at:104' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)" ""
+# 58. EXPRTest.at:104: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)
+at_setup_line='EXPRTest.at:104'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] (pass)"
+$at_quiet $as_echo_n " 58: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "58. $at_setup_line: testing $at_desc ..."
+  $as_echo "58. EXPRTest.at:104: testing ..."
   $at_traceon
 
 
@@ -6952,79 +8641,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: mv stdout \$abs_srcdir/expr-testsuite/test.5e.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp" "EXPRTest.at:104"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5e.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true" "EXPRTest.at:104"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k g[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:104: diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5e.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr" "EXPRTest.at:104"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:104 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5e.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:104"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_58
 #AT_START_59
-at_fn_group_banner 59 'EXPRTest.at:105' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)" ""
+# 59. EXPRTest.at:105: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)
+at_setup_line='EXPRTest.at:105'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)"
+$at_quiet $as_echo_n " 59: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "59. $at_setup_line: testing $at_desc ..."
+  $as_echo "59. EXPRTest.at:105: testing ..."
   $at_traceon
 
 
@@ -7036,79 +8757,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: mv stdout \$abs_srcdir/expr-testsuite/test.6b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp" "EXPRTest.at:105"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr" "EXPRTest.at:105"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_59
 #AT_START_60
-at_fn_group_banner 60 'EXPRTest.at:105' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)" ""
+# 60. EXPRTest.at:105: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)
+at_setup_line='EXPRTest.at:105'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] (pass)"
+$at_quiet $as_echo_n " 60: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "60. $at_setup_line: testing $at_desc ..."
+  $as_echo "60. EXPRTest.at:105: testing ..."
   $at_traceon
 
 
@@ -7120,79 +8873,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: mv stdout \$abs_srcdir/expr-testsuite/test.6b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp" "EXPRTest.at:105"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true" "EXPRTest.at:105"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k i[1:4:9] -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:105: diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr" "EXPRTest.at:105"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:105 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:105"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_60
 #AT_START_61
-at_fn_group_banner 61 'EXPRTest.at:109' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)" ""
+# 61. EXPRTest.at:109: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) (pass)
+at_setup_line='EXPRTest.at:109'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)"
+$at_quiet $as_echo_n " 61: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "61. $at_setup_line: testing $at_desc ..."
+  $as_echo "61. EXPRTest.at:109: testing ..."
   $at_traceon
 
 
@@ -7204,79 +8989,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: mv stdout \$abs_srcdir/expr-testsuite/test.6.func1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp" "EXPRTest.at:109"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr" "EXPRTest.at:109"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_61
 #AT_START_62
-at_fn_group_banner 62 'EXPRTest.at:109' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)" ""
+# 62. EXPRTest.at:109: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) (pass)
+at_setup_line='EXPRTest.at:109'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) (pass)"
+$at_quiet $as_echo_n " 62: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "62. $at_setup_line: testing $at_desc ..."
+  $as_echo "62. EXPRTest.at:109: testing ..."
   $at_traceon
 
 
@@ -7288,79 +9105,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: mv stdout \$abs_srcdir/expr-testsuite/test.6.func1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp" "EXPRTest.at:109"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true" "EXPRTest.at:109"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:109: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr" "EXPRTest.at:109"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:109 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:109"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_62
 #AT_START_63
-at_fn_group_banner 63 'EXPRTest.at:110' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)" ""
+# 63. EXPRTest.at:110: expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) (pass)
+at_setup_line='EXPRTest.at:110'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)"
+$at_quiet $as_echo_n " 63: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "63. $at_setup_line: testing $at_desc ..."
+  $as_echo "63. EXPRTest.at:110: testing ..."
   $at_traceon
 
 
@@ -7372,79 +9221,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: mv stdout \$abs_srcdir/expr-testsuite/test.6.func2.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp" "EXPRTest.at:110"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr" "EXPRTest.at:110"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_63
 #AT_START_64
-at_fn_group_banner 64 'EXPRTest.at:110' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)" ""
+# 64. EXPRTest.at:110: expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) (pass)
+at_setup_line='EXPRTest.at:110'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) (pass)"
+$at_quiet $as_echo_n " 64: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "64. $at_setup_line: testing $at_desc ..."
+  $as_echo "64. EXPRTest.at:110: testing ..."
   $at_traceon
 
 
@@ -7456,79 +9337,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: mv stdout \$abs_srcdir/expr-testsuite/test.6.func2.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp" "EXPRTest.at:110"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.6.func2.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true" "EXPRTest.at:110"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\\(i[2:4][3:6],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.6 -k scale\(i[2:4][3:6],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:110: diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.6.func2.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr" "EXPRTest.at:110"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:110 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.6.func2.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:110"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_64
 #AT_START_65
-at_fn_group_banner 65 'EXPRTest.at:112' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)" ""
+# 65. EXPRTest.at:112: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) (pass)
+at_setup_line='EXPRTest.at:112'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)"
+$at_quiet $as_echo_n " 65: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "65. $at_setup_line: testing $at_desc ..."
+  $as_echo "65. EXPRTest.at:112: testing ..."
   $at_traceon
 
 
@@ -7540,79 +9453,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: mv stdout \$abs_srcdir/expr-testsuite/test.5.func3.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp" "EXPRTest.at:112"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr" "EXPRTest.at:112"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_65
 #AT_START_66
-at_fn_group_banner 66 'EXPRTest.at:112' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)" ""
+# 66. EXPRTest.at:112: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) (pass)
+at_setup_line='EXPRTest.at:112'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) (pass)"
+$at_quiet $as_echo_n " 66: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "66. $at_setup_line: testing $at_desc ..."
+  $as_echo "66. EXPRTest.at:112: testing ..."
   $at_traceon
 
 
@@ -7624,79 +9569,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: mv stdout \$abs_srcdir/expr-testsuite/test.5.func3.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp" "EXPRTest.at:112"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func3.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true" "EXPRTest.at:112"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(i[3],2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(i[3],2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:112: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func3.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr" "EXPRTest.at:112"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:112 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func3.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:112"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_66
 #AT_START_67
-at_fn_group_banner 67 'EXPRTest.at:114' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)" ""
+# 67. EXPRTest.at:114: expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) (pass)
+at_setup_line='EXPRTest.at:114'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)"
+$at_quiet $as_echo_n " 67: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "67. $at_setup_line: testing $at_desc ..."
+  $as_echo "67. EXPRTest.at:114: testing ..."
   $at_traceon
 
 
@@ -7708,79 +9685,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: mv stdout \$abs_srcdir/expr-testsuite/test.5.func4.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp" "EXPRTest.at:114"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr" "EXPRTest.at:114"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_67
 #AT_START_68
-at_fn_group_banner 68 'EXPRTest.at:114' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)" ""
+# 68. EXPRTest.at:114: expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) (pass)
+at_setup_line='EXPRTest.at:114'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) (pass)"
+$at_quiet $as_echo_n " 68: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "68. $at_setup_line: testing $at_desc ..."
+  $as_echo "68. EXPRTest.at:114: testing ..."
   $at_traceon
 
 
@@ -7792,79 +9801,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: mv stdout \$abs_srcdir/expr-testsuite/test.5.func4.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp" "EXPRTest.at:114"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.5.func4.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true" "EXPRTest.at:114"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\\(j,2\\) -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.5 -k scale\(j,2\) -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:114: diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.5.func4.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr" "EXPRTest.at:114"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:114 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.5.func4.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:114"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_68
 #AT_START_69
-at_fn_group_banner 69 'EXPRTest.at:116' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
+# 69. EXPRTest.at:116: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b (pass)
+at_setup_line='EXPRTest.at:116'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 69: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "69. $at_setup_line: testing $at_desc ..."
+  $as_echo "69. EXPRTest.at:116: testing ..."
   $at_traceon
 
 
@@ -7876,79 +9917,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: mv stdout \$abs_srcdir/expr-testsuite/test.a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp" "EXPRTest.at:116"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr" "EXPRTest.at:116"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_69
 #AT_START_70
-at_fn_group_banner 70 'EXPRTest.at:116' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)" ""
+# 70. EXPRTest.at:116: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b (pass)
+at_setup_line='EXPRTest.at:116'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 70: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "70. $at_setup_line: testing $at_desc ..."
+  $as_echo "70. EXPRTest.at:116: testing ..."
   $at_traceon
 
 
@@ -7960,79 +10033,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: mv stdout \$abs_srcdir/expr-testsuite/test.a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp" "EXPRTest.at:116"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:116"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:116: diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr" "EXPRTest.at:116"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:116 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:116"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_70
 #AT_START_71
-at_fn_group_banner 71 'EXPRTest.at:117' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)" ""
+# 71. EXPRTest.at:117: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:117'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 71: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "71. $at_setup_line: testing $at_desc ..."
+  $as_echo "71. EXPRTest.at:117: testing ..."
   $at_traceon
 
 
@@ -8044,79 +10149,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: mv stdout \$abs_srcdir/expr-testsuite/test.aa.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp" "EXPRTest.at:117"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr" "EXPRTest.at:117"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_71
 #AT_START_72
-at_fn_group_banner 72 'EXPRTest.at:117' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)" ""
+# 72. EXPRTest.at:117: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:117'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 72: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "72. $at_setup_line: testing $at_desc ..."
+  $as_echo "72. EXPRTest.at:117: testing ..."
   $at_traceon
 
 
@@ -8128,79 +10265,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: mv stdout \$abs_srcdir/expr-testsuite/test.aa.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp" "EXPRTest.at:117"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.aa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:117"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:117: diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.aa.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr" "EXPRTest.at:117"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:117 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.aa.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:117"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_72
 #AT_START_73
-at_fn_group_banner 73 'EXPRTest.at:118' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)" ""
+# 73. EXPRTest.at:118: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b (pass)
+at_setup_line='EXPRTest.at:118'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)"
+$at_quiet $as_echo_n " 73: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "73. $at_setup_line: testing $at_desc ..."
+  $as_echo "73. EXPRTest.at:118: testing ..."
   $at_traceon
 
 
@@ -8212,79 +10381,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: mv stdout \$abs_srcdir/expr-testsuite/test.ab.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp" "EXPRTest.at:118"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr" "EXPRTest.at:118"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_73
 #AT_START_74
-at_fn_group_banner 74 'EXPRTest.at:118' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)" ""
+# 74. EXPRTest.at:118: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b (pass)
+at_setup_line='EXPRTest.at:118'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b (pass)"
+$at_quiet $as_echo_n " 74: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "74. $at_setup_line: testing $at_desc ..."
+  $as_echo "74. EXPRTest.at:118: testing ..."
   $at_traceon
 
 
@@ -8296,79 +10497,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: mv stdout \$abs_srcdir/expr-testsuite/test.ab.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp" "EXPRTest.at:118"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ab.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true" "EXPRTest.at:118"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"j&i>2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "j&i>2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:118: diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ab.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr" "EXPRTest.at:118"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:118 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ab.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:118"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_74
 #AT_START_75
-at_fn_group_banner 75 'EXPRTest.at:119' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)" ""
+# 75. EXPRTest.at:119: expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b (pass)
+at_setup_line='EXPRTest.at:119'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)"
+$at_quiet $as_echo_n " 75: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "75. $at_setup_line: testing $at_desc ..."
+  $as_echo "75. EXPRTest.at:119: testing ..."
   $at_traceon
 
 
@@ -8380,79 +10613,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: mv stdout \$abs_srcdir/expr-testsuite/test.ac.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp" "EXPRTest.at:119"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr" "EXPRTest.at:119"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_75
 #AT_START_76
-at_fn_group_banner 76 'EXPRTest.at:119' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)" ""
+# 76. EXPRTest.at:119: expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b (pass)
+at_setup_line='EXPRTest.at:119'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b (pass)"
+$at_quiet $as_echo_n " 76: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "76. $at_setup_line: testing $at_desc ..."
+  $as_echo "76. EXPRTest.at:119: testing ..."
   $at_traceon
 
 
@@ -8464,79 +10729,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: mv stdout \$abs_srcdir/expr-testsuite/test.ac.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp" "EXPRTest.at:119"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ac.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:119"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k \"i,j&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.a -k "i,j&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:119: diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ac.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr" "EXPRTest.at:119"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:119 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ac.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:119"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_76
 #AT_START_77
-at_fn_group_banner 77 'EXPRTest.at:120' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
+# 77. EXPRTest.at:120: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b (pass)
+at_setup_line='EXPRTest.at:120'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 77: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "77. $at_setup_line: testing $at_desc ..."
+  $as_echo "77. EXPRTest.at:120: testing ..."
   $at_traceon
 
 
@@ -8548,79 +10845,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: mv stdout \$abs_srcdir/expr-testsuite/test.b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp" "EXPRTest.at:120"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr" "EXPRTest.at:120"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_77
 #AT_START_78
-at_fn_group_banner 78 'EXPRTest.at:120' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)" ""
+# 78. EXPRTest.at:120: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b (pass)
+at_setup_line='EXPRTest.at:120'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 78: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "78. $at_setup_line: testing $at_desc ..."
+  $as_echo "78. EXPRTest.at:120: testing ..."
   $at_traceon
 
 
@@ -8632,79 +10961,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: mv stdout \$abs_srcdir/expr-testsuite/test.b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp" "EXPRTest.at:120"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:120"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:120: diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr" "EXPRTest.at:120"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:120 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:120"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_78
 #AT_START_79
-at_fn_group_banner 79 'EXPRTest.at:121' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)" ""
+# 79. EXPRTest.at:121: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b (pass)
+at_setup_line='EXPRTest.at:121'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)"
+$at_quiet $as_echo_n " 79: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "79. $at_setup_line: testing $at_desc ..."
+  $as_echo "79. EXPRTest.at:121: testing ..."
   $at_traceon
 
 
@@ -8716,79 +11077,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: mv stdout \$abs_srcdir/expr-testsuite/test.ba.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp" "EXPRTest.at:121"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr" "EXPRTest.at:121"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_79
 #AT_START_80
-at_fn_group_banner 80 'EXPRTest.at:121' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)" ""
+# 80. EXPRTest.at:121: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b (pass)
+at_setup_line='EXPRTest.at:121'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b (pass)"
+$at_quiet $as_echo_n " 80: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "80. $at_setup_line: testing $at_desc ..."
+  $as_echo "80. EXPRTest.at:121: testing ..."
   $at_traceon
 
 
@@ -8800,79 +11193,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: mv stdout \$abs_srcdir/expr-testsuite/test.ba.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp" "EXPRTest.at:121"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.ba.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true" "EXPRTest.at:121"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:121: diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.ba.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr" "EXPRTest.at:121"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:121 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.ba.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:121"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_80
 #AT_START_81
-at_fn_group_banner 81 'EXPRTest.at:122' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)" ""
+# 81. EXPRTest.at:122: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:122'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 81: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "81. $at_setup_line: testing $at_desc ..."
+  $as_echo "81. EXPRTest.at:122: testing ..."
   $at_traceon
 
 
@@ -8884,79 +11309,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: mv stdout \$abs_srcdir/expr-testsuite/test.bb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp" "EXPRTest.at:122"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr" "EXPRTest.at:122"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_81
 #AT_START_82
-at_fn_group_banner 82 'EXPRTest.at:122' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)" ""
+# 82. EXPRTest.at:122: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:122'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 82: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "82. $at_setup_line: testing $at_desc ..."
+  $as_echo "82. EXPRTest.at:122: testing ..."
   $at_traceon
 
 
@@ -8968,79 +11425,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: mv stdout \$abs_srcdir/expr-testsuite/test.bb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp" "EXPRTest.at:122"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:122"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:122: diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr" "EXPRTest.at:122"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:122 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:122"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_82
 #AT_START_83
-at_fn_group_banner 83 'EXPRTest.at:123' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)" ""
+# 83. EXPRTest.at:123: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b (pass)
+at_setup_line='EXPRTest.at:123'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)"
+$at_quiet $as_echo_n " 83: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "83. $at_setup_line: testing $at_desc ..."
+  $as_echo "83. EXPRTest.at:123: testing ..."
   $at_traceon
 
 
@@ -9052,79 +11541,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: mv stdout \$abs_srcdir/expr-testsuite/test.bc.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp" "EXPRTest.at:123"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr" "EXPRTest.at:123"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_83
 #AT_START_84
-at_fn_group_banner 84 'EXPRTest.at:123' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)" ""
+# 84. EXPRTest.at:123: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b (pass)
+at_setup_line='EXPRTest.at:123'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b (pass)"
+$at_quiet $as_echo_n " 84: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "84. $at_setup_line: testing $at_desc ..."
+  $as_echo "84. EXPRTest.at:123: testing ..."
   $at_traceon
 
 
@@ -9136,79 +11657,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: mv stdout \$abs_srcdir/expr-testsuite/test.bc.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp" "EXPRTest.at:123"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:123"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,f&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,f&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:123: diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bc.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr" "EXPRTest.at:123"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:123 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bc.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:123"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_84
 #AT_START_85
-at_fn_group_banner 85 'EXPRTest.at:124' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)" ""
+# 85. EXPRTest.at:124: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:124'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 85: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "85. $at_setup_line: testing $at_desc ..."
+  $as_echo "85. EXPRTest.at:124: testing ..."
   $at_traceon
 
 
@@ -9220,79 +11773,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: mv stdout \$abs_srcdir/expr-testsuite/test.bd.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp" "EXPRTest.at:124"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr" "EXPRTest.at:124"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_85
 #AT_START_86
-at_fn_group_banner 86 'EXPRTest.at:124' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)" ""
+# 86. EXPRTest.at:124: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:124'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 86: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "86. $at_setup_line: testing $at_desc ..."
+  $as_echo "86. EXPRTest.at:124: testing ..."
   $at_traceon
 
 
@@ -9304,79 +11889,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: mv stdout \$abs_srcdir/expr-testsuite/test.bd.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp" "EXPRTest.at:124"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.bd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:124"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"i,j&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "i,j&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:124: diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.bd.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr" "EXPRTest.at:124"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:124 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.bd.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:124"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_86
 #AT_START_87
-at_fn_group_banner 87 'EXPRTest.at:125' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)" ""
+# 87. EXPRTest.at:125: expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b (pass)
+at_setup_line='EXPRTest.at:125'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)"
+$at_quiet $as_echo_n " 87: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "87. $at_setup_line: testing $at_desc ..."
+  $as_echo "87. EXPRTest.at:125: testing ..."
   $at_traceon
 
 
@@ -9388,79 +12005,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: mv stdout \$abs_srcdir/expr-testsuite/test.be.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp" "EXPRTest.at:125"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr" "EXPRTest.at:125"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_87
 #AT_START_88
-at_fn_group_banner 88 'EXPRTest.at:125' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)" ""
+# 88. EXPRTest.at:125: expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b (pass)
+at_setup_line='EXPRTest.at:125'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b (pass)"
+$at_quiet $as_echo_n " 88: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "88. $at_setup_line: testing $at_desc ..."
+  $as_echo "88. EXPRTest.at:125: testing ..."
   $at_traceon
 
 
@@ -9472,79 +12121,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: mv stdout \$abs_srcdir/expr-testsuite/test.be.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp" "EXPRTest.at:125"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.be.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:125"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k \"&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.b -k "&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:125: diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.be.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr" "EXPRTest.at:125"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:125 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.be.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.be.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:125"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_88
 #AT_START_89
-at_fn_group_banner 89 'EXPRTest.at:126' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
+# 89. EXPRTest.at:126: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b (pass)
+at_setup_line='EXPRTest.at:126'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 89: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "89. $at_setup_line: testing $at_desc ..."
+  $as_echo "89. EXPRTest.at:126: testing ..."
   $at_traceon
 
 
@@ -9556,79 +12237,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: mv stdout \$abs_srcdir/expr-testsuite/test.d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp" "EXPRTest.at:126"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr" "EXPRTest.at:126"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_89
 #AT_START_90
-at_fn_group_banner 90 'EXPRTest.at:126' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)" ""
+# 90. EXPRTest.at:126: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b (pass)
+at_setup_line='EXPRTest.at:126'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b (pass)"
+$at_quiet $as_echo_n " 90: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "90. $at_setup_line: testing $at_desc ..."
+  $as_echo "90. EXPRTest.at:126: testing ..."
   $at_traceon
 
 
@@ -9640,79 +12353,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: mv stdout \$abs_srcdir/expr-testsuite/test.d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp" "EXPRTest.at:126"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true" "EXPRTest.at:126"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:126: diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr" "EXPRTest.at:126"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:126 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:126"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_90
 #AT_START_91
-at_fn_group_banner 91 'EXPRTest.at:127' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)" ""
+# 91. EXPRTest.at:127: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b (pass)
+at_setup_line='EXPRTest.at:127'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)"
+$at_quiet $as_echo_n " 91: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "91. $at_setup_line: testing $at_desc ..."
+  $as_echo "91. EXPRTest.at:127: testing ..."
   $at_traceon
 
 
@@ -9724,79 +12469,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: mv stdout \$abs_srcdir/expr-testsuite/test.da.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp" "EXPRTest.at:127"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr" "EXPRTest.at:127"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_91
 #AT_START_92
-at_fn_group_banner 92 'EXPRTest.at:127' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)" ""
+# 92. EXPRTest.at:127: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b (pass)
+at_setup_line='EXPRTest.at:127'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b (pass)"
+$at_quiet $as_echo_n " 92: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "92. $at_setup_line: testing $at_desc ..."
+  $as_echo "92. EXPRTest.at:127: testing ..."
   $at_traceon
 
 
@@ -9808,79 +12585,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: mv stdout \$abs_srcdir/expr-testsuite/test.da.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp" "EXPRTest.at:127"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.da.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true" "EXPRTest.at:127"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:127: diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.da.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr" "EXPRTest.at:127"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:127 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.da.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.da.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:127"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_92
 #AT_START_93
-at_fn_group_banner 93 'EXPRTest.at:128' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)" ""
+# 93. EXPRTest.at:128: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:128'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 93: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "93. $at_setup_line: testing $at_desc ..."
+  $as_echo "93. EXPRTest.at:128: testing ..."
   $at_traceon
 
 
@@ -9892,79 +12701,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: mv stdout \$abs_srcdir/expr-testsuite/test.db.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp" "EXPRTest.at:128"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr" "EXPRTest.at:128"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_93
 #AT_START_94
-at_fn_group_banner 94 'EXPRTest.at:128' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)" ""
+# 94. EXPRTest.at:128: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:128'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 94: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "94. $at_setup_line: testing $at_desc ..."
+  $as_echo "94. EXPRTest.at:128: testing ..."
   $at_traceon
 
 
@@ -9976,79 +12817,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: mv stdout \$abs_srcdir/expr-testsuite/test.db.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp" "EXPRTest.at:128"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.db.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:128"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:128: diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.db.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr" "EXPRTest.at:128"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:128 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.db.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.db.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:128"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_94
 #AT_START_95
-at_fn_group_banner 95 'EXPRTest.at:129' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)" ""
+# 95. EXPRTest.at:129: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b (pass)
+at_setup_line='EXPRTest.at:129'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)"
+$at_quiet $as_echo_n " 95: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "95. $at_setup_line: testing $at_desc ..."
+  $as_echo "95. EXPRTest.at:129: testing ..."
   $at_traceon
 
 
@@ -10060,79 +12933,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: mv stdout \$abs_srcdir/expr-testsuite/test.dc.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp" "EXPRTest.at:129"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr" "EXPRTest.at:129"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_95
 #AT_START_96
-at_fn_group_banner 96 'EXPRTest.at:129' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)" ""
+# 96. EXPRTest.at:129: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b (pass)
+at_setup_line='EXPRTest.at:129'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b (pass)"
+$at_quiet $as_echo_n " 96: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "96. $at_setup_line: testing $at_desc ..."
+  $as_echo "96. EXPRTest.at:129: testing ..."
   $at_traceon
 
 
@@ -10144,79 +13049,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: mv stdout \$abs_srcdir/expr-testsuite/test.dc.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp" "EXPRTest.at:129"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dc.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true" "EXPRTest.at:129"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&f<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&f<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:129: diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dc.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr" "EXPRTest.at:129"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:129 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dc.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:129"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_96
 #AT_START_97
-at_fn_group_banner 97 'EXPRTest.at:130' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)" ""
+# 97. EXPRTest.at:130: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b (pass)
+at_setup_line='EXPRTest.at:130'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)"
+$at_quiet $as_echo_n " 97: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "97. $at_setup_line: testing $at_desc ..."
+  $as_echo "97. EXPRTest.at:130: testing ..."
   $at_traceon
 
 
@@ -10228,79 +13165,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: mv stdout \$abs_srcdir/expr-testsuite/test.dd.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp" "EXPRTest.at:130"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr" "EXPRTest.at:130"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_97
 #AT_START_98
-at_fn_group_banner 98 'EXPRTest.at:130' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)" ""
+# 98. EXPRTest.at:130: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b (pass)
+at_setup_line='EXPRTest.at:130'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b (pass)"
+$at_quiet $as_echo_n " 98: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "98. $at_setup_line: testing $at_desc ..."
+  $as_echo "98. EXPRTest.at:130: testing ..."
   $at_traceon
 
 
@@ -10312,79 +13281,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: mv stdout \$abs_srcdir/expr-testsuite/test.dd.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp" "EXPRTest.at:130"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dd.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true" "EXPRTest.at:130"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&a<10\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&a<10" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:130: diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dd.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr" "EXPRTest.at:130"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:130 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dd.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:130"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_98
 #AT_START_99
-at_fn_group_banner 99 'EXPRTest.at:131' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)" ""
+# 99. EXPRTest.at:131: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:131'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)"
+$at_quiet $as_echo_n " 99: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "99. $at_setup_line: testing $at_desc ..."
+  $as_echo "99. EXPRTest.at:131: testing ..."
   $at_traceon
 
 
@@ -10396,79 +13397,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: mv stdout \$abs_srcdir/expr-testsuite/test.de.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp" "EXPRTest.at:131"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr" "EXPRTest.at:131"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_99
 #AT_START_100
-at_fn_group_banner 100 'EXPRTest.at:131' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)" ""
+# 100. EXPRTest.at:131: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:131'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b (pass)"
+$at_quiet $as_echo_n "100: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "100. $at_setup_line: testing $at_desc ..."
+  $as_echo "100. EXPRTest.at:131: testing ..."
   $at_traceon
 
 
@@ -10480,79 +13513,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: mv stdout \$abs_srcdir/expr-testsuite/test.de.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp" "EXPRTest.at:131"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.de.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:131"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:131: diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.de.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr" "EXPRTest.at:131"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:131 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.de.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.de.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:131"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_100
 #AT_START_101
-at_fn_group_banner 101 'EXPRTest.at:132' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)" ""
+# 101. EXPRTest.at:132: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:132'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)"
+$at_quiet $as_echo_n "101: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "101. $at_setup_line: testing $at_desc ..."
+  $as_echo "101. EXPRTest.at:132: testing ..."
   $at_traceon
 
 
@@ -10564,79 +13629,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: mv stdout \$abs_srcdir/expr-testsuite/test.df.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp" "EXPRTest.at:132"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr" "EXPRTest.at:132"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_101
 #AT_START_102
-at_fn_group_banner 102 'EXPRTest.at:132' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)" ""
+# 102. EXPRTest.at:132: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b (pass)
+at_setup_line='EXPRTest.at:132'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b (pass)"
+$at_quiet $as_echo_n "102: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "102. $at_setup_line: testing $at_desc ..."
+  $as_echo "102. EXPRTest.at:132: testing ..."
   $at_traceon
 
 
@@ -10648,79 +13745,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: mv stdout \$abs_srcdir/expr-testsuite/test.df.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp" "EXPRTest.at:132"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.df.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true" "EXPRTest.at:132"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i&i<2000\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i&i<2000" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:132: diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.df.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr" "EXPRTest.at:132"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:132 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.df.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.df.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:132"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_102
 #AT_START_103
-at_fn_group_banner 103 'EXPRTest.at:133' \
-  "expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)" ""
+# 103. EXPRTest.at:133: expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b (pass)
+at_setup_line='EXPRTest.at:133'
+at_desc="expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)"
+$at_quiet $as_echo_n "103: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "103. $at_setup_line: testing $at_desc ..."
+  $as_echo "103. EXPRTest.at:133: testing ..."
   $at_traceon
 
 
@@ -10732,79 +13861,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: mv stdout \$abs_srcdir/expr-testsuite/test.dg.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp" "EXPRTest.at:133"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -w \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
-( $at_check_trace; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -w $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr" "EXPRTest.at:133"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_103
 #AT_START_104
-at_fn_group_banner 104 'EXPRTest.at:133' \
-  "expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)" ""
+# 104. EXPRTest.at:133: expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b (pass)
+at_setup_line='EXPRTest.at:133'
+at_desc="expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b (pass)"
+$at_quiet $as_echo_n "104: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "104. $at_setup_line: testing $at_desc ..."
+  $as_echo "104. EXPRTest.at:133: testing ..."
   $at_traceon
 
 
@@ -10816,79 +13977,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: mv stdout \$abs_srcdir/expr-testsuite/test.dg.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp" "EXPRTest.at:133"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.dg.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: \$abs_builddir/expr-test -W \$abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true" "EXPRTest.at:133"
-( $at_check_trace; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k \"i,f,a&i<0\" -b -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -W $abs_srcdir/expr-testsuite/test.d -k "i,f,a&i<0" -b -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:133: diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.dg.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr" "EXPRTest.at:133"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:133 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.dg.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:133"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_104
 #AT_START_105
-at_fn_group_banner 105 'EXPRTest.at:135' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i (pass)" ""
+# 105. EXPRTest.at:135: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i (pass)
+at_setup_line='EXPRTest.at:135'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i (pass)"
+$at_quiet $as_echo_n "105: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "105. $at_setup_line: testing $at_desc ..."
+  $as_echo "105. EXPRTest.at:135: testing ..."
   $at_traceon
 
 
@@ -10900,79 +14093,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: mv stdout \$abs_srcdir/expr-testsuite/data.61a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp" "EXPRTest.at:135"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr" "EXPRTest.at:135"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_105
 #AT_START_106
-at_fn_group_banner 106 'EXPRTest.at:135' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i (pass)" ""
+# 106. EXPRTest.at:135: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i (pass)
+at_setup_line='EXPRTest.at:135'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i (pass)"
+$at_quiet $as_echo_n "106: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "106. $at_setup_line: testing $at_desc ..."
+  $as_echo "106. EXPRTest.at:135: testing ..."
   $at_traceon
 
 
@@ -10984,79 +14209,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: mv stdout \$abs_srcdir/expr-testsuite/data.61a.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp" "EXPRTest.at:135"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61a.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true" "EXPRTest.at:135"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k i -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:135: diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61a.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr" "EXPRTest.at:135"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:135 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61a.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:135"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_106
 #AT_START_107
-at_fn_group_banner 107 'EXPRTest.at:136' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)" ""
+# 107. EXPRTest.at:136: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)
+at_setup_line='EXPRTest.at:136'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)"
+$at_quiet $as_echo_n "107: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "107. $at_setup_line: testing $at_desc ..."
+  $as_echo "107. EXPRTest.at:136: testing ..."
   $at_traceon
 
 
@@ -11068,79 +14325,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:136"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: mv stdout \$abs_srcdir/expr-testsuite/data.61b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp" "EXPRTest.at:136"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:136"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr" "EXPRTest.at:136"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_107
 #AT_START_108
-at_fn_group_banner 108 'EXPRTest.at:136' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)" ""
+# 108. EXPRTest.at:136: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)
+at_setup_line='EXPRTest.at:136'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  (pass)"
+$at_quiet $as_echo_n "108: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "108. $at_setup_line: testing $at_desc ..."
+  $as_echo "108. EXPRTest.at:136: testing ..."
   $at_traceon
 
 
@@ -11152,79 +14441,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:136"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: mv stdout \$abs_srcdir/expr-testsuite/data.61b.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp" "EXPRTest.at:136"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61b.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:136"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[0:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:136: diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61b.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr" "EXPRTest.at:136"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:136 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61b.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:136"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_108
 #AT_START_109
-at_fn_group_banner 109 'EXPRTest.at:137' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)" ""
+# 109. EXPRTest.at:137: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)
+at_setup_line='EXPRTest.at:137'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)"
+$at_quiet $as_echo_n "109: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "109. $at_setup_line: testing $at_desc ..."
+  $as_echo "109. EXPRTest.at:137: testing ..."
   $at_traceon
 
 
@@ -11236,79 +14557,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:137"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: mv stdout \$abs_srcdir/expr-testsuite/data.61c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp" "EXPRTest.at:137"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:137"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr" "EXPRTest.at:137"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_109
 #AT_START_110
-at_fn_group_banner 110 'EXPRTest.at:137' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)" ""
+# 110. EXPRTest.at:137: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)
+at_setup_line='EXPRTest.at:137'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  (pass)"
+$at_quiet $as_echo_n "110: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "110. $at_setup_line: testing $at_desc ..."
+  $as_echo "110. EXPRTest.at:137: testing ..."
   $at_traceon
 
 
@@ -11320,79 +14673,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:137"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: mv stdout \$abs_srcdir/expr-testsuite/data.61c.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp" "EXPRTest.at:137"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61c.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true" "EXPRTest.at:137"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][0:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:137: diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61c.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr" "EXPRTest.at:137"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:137 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61c.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:137"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_110
 #AT_START_111
-at_fn_group_banner 111 'EXPRTest.at:138' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)" ""
+# 111. EXPRTest.at:138: expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)
+at_setup_line='EXPRTest.at:138'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)"
+$at_quiet $as_echo_n "111: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "111. $at_setup_line: testing $at_desc ..."
+  $as_echo "111. EXPRTest.at:138: testing ..."
   $at_traceon
 
 
@@ -11404,79 +14789,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true" "EXPRTest.at:138"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: mv stdout \$abs_srcdir/expr-testsuite/data.61d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp" "EXPRTest.at:138"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true" "EXPRTest.at:138"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr" "EXPRTest.at:138"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_111
 #AT_START_112
-at_fn_group_banner 112 'EXPRTest.at:138' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)" ""
+# 112. EXPRTest.at:138: expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)
+at_setup_line='EXPRTest.at:138'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  (pass)"
+$at_quiet $as_echo_n "112: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "112. $at_setup_line: testing $at_desc ..."
+  $as_echo "112. EXPRTest.at:138: testing ..."
   $at_traceon
 
 
@@ -11488,79 +14905,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true" "EXPRTest.at:138"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: mv stdout \$abs_srcdir/expr-testsuite/data.61d.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp" "EXPRTest.at:138"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.61d.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true" "EXPRTest.at:138"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.61 -k  i[1:2][1:2]  -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:138: diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.61d.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr" "EXPRTest.at:138"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:138 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.61d.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:138"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_112
 #AT_START_113
-at_fn_group_banner 113 'EXPRTest.at:139' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)" ""
+# 113. EXPRTest.at:139: expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST (pass)
+at_setup_line='EXPRTest.at:139'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)"
+$at_quiet $as_echo_n "113: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "113. $at_setup_line: testing $at_desc ..."
+  $as_echo "113. EXPRTest.at:139: testing ..."
   $at_traceon
 
 
@@ -11572,79 +15021,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: mv stdout \$abs_srcdir/expr-testsuite/data.z1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp" "EXPRTest.at:139"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr" "EXPRTest.at:139"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_113
 #AT_START_114
-at_fn_group_banner 114 'EXPRTest.at:139' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)" ""
+# 114. EXPRTest.at:139: expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST (pass)
+at_setup_line='EXPRTest.at:139'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST (pass)"
+$at_quiet $as_echo_n "114: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "114. $at_setup_line: testing $at_desc ..."
+  $as_echo "114. EXPRTest.at:139: testing ..."
   $at_traceon
 
 
@@ -11656,79 +15137,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: mv stdout \$abs_srcdir/expr-testsuite/data.z1.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp" "EXPRTest.at:139"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.z1.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true" "EXPRTest.at:139"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.c0 -k SST -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:139: diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.z1.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr" "EXPRTest.at:139"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:139 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.z1.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:139"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_114
 #AT_START_115
-at_fn_group_banner 115 'EXPRTest.at:141' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
+# 115. EXPRTest.at:141: expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" (pass)
+at_setup_line='EXPRTest.at:141'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)"
+$at_quiet $as_echo_n "115: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "115. $at_setup_line: testing $at_desc ..."
+  $as_echo "115. EXPRTest.at:141: testing ..."
   $at_traceon
 
 
@@ -11740,79 +15253,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: mv stdout \$abs_srcdir/expr-testsuite/test.fa.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp" "EXPRTest.at:141"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr" "EXPRTest.at:141"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_115
 #AT_START_116
-at_fn_group_banner 116 'EXPRTest.at:141' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)" ""
+# 116. EXPRTest.at:141: expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" (pass)
+at_setup_line='EXPRTest.at:141'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" (pass)"
+$at_quiet $as_echo_n "116: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "116. $at_setup_line: testing $at_desc ..."
+  $as_echo "116. EXPRTest.at:141: testing ..."
   $at_traceon
 
 
@@ -11824,79 +15369,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: mv stdout \$abs_srcdir/expr-testsuite/test.fa.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp" "EXPRTest.at:141"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.fa.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true" "EXPRTest.at:141"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:141: diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fa.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr" "EXPRTest.at:141"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:141 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fa.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:141"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_116
 #AT_START_117
-at_fn_group_banner 117 'EXPRTest.at:142' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)" ""
+# 117. EXPRTest.at:142: expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" (pass)
+at_setup_line='EXPRTest.at:142'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)"
+$at_quiet $as_echo_n "117: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "117. $at_setup_line: testing $at_desc ..."
+  $as_echo "117. EXPRTest.at:142: testing ..."
   $at_traceon
 
 
@@ -11908,79 +15485,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: mv stdout \$abs_srcdir/expr-testsuite/test.fb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp" "EXPRTest.at:142"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr" "EXPRTest.at:142"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_117
 #AT_START_118
-at_fn_group_banner 118 'EXPRTest.at:142' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)" ""
+# 118. EXPRTest.at:142: expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" (pass)
+at_setup_line='EXPRTest.at:142'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" (pass)"
+$at_quiet $as_echo_n "118: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "118. $at_setup_line: testing $at_desc ..."
+  $as_echo "118. EXPRTest.at:142: testing ..."
   $at_traceon
 
 
@@ -11992,79 +15601,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: mv stdout \$abs_srcdir/expr-testsuite/test.fb.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp" "EXPRTest.at:142"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/test.fb.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true" "EXPRTest.at:142"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k \"&i<3000\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.f -k "&i<3000" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:142: diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/test.fb.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr" "EXPRTest.at:142"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:142 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stdout || diff -b -B $abs_srcdir/expr-testsuite/test.fb.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:142"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_118
 #AT_START_119
-at_fn_group_banner 119 'EXPRTest.at:146' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)" ""
+# 119. EXPRTest.at:146: expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" (pass)
+at_setup_line='EXPRTest.at:146'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "119: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "119. $at_setup_line: testing $at_desc ..."
+  $as_echo "119. EXPRTest.at:146: testing ..."
   $at_traceon
 
 
@@ -12076,79 +15717,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: mv stdout \$abs_srcdir/expr-testsuite/data.21.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp" "EXPRTest.at:146"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr" "EXPRTest.at:146"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_119
 #AT_START_120
-at_fn_group_banner 120 'EXPRTest.at:146' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)" ""
+# 120. EXPRTest.at:146: expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" (pass)
+at_setup_line='EXPRTest.at:146'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "120: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "120. $at_setup_line: testing $at_desc ..."
+  $as_echo "120. EXPRTest.at:146: testing ..."
   $at_traceon
 
 
@@ -12160,79 +15833,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: mv stdout \$abs_srcdir/expr-testsuite/data.21.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp" "EXPRTest.at:146"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.21.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:146"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.21.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:146: diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.21.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr" "EXPRTest.at:146"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:146 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.21.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.21.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:146"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_120
 #AT_START_121
-at_fn_group_banner 121 'EXPRTest.at:147' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)" ""
+# 121. EXPRTest.at:147: expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" (pass)
+at_setup_line='EXPRTest.at:147'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "121: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "121. $at_setup_line: testing $at_desc ..."
+  $as_echo "121. EXPRTest.at:147: testing ..."
   $at_traceon
 
 
@@ -12244,79 +15949,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: mv stdout \$abs_srcdir/expr-testsuite/data.22.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp" "EXPRTest.at:147"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr" "EXPRTest.at:147"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_121
 #AT_START_122
-at_fn_group_banner 122 'EXPRTest.at:147' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)" ""
+# 122. EXPRTest.at:147: expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" (pass)
+at_setup_line='EXPRTest.at:147'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "122: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "122. $at_setup_line: testing $at_desc ..."
+  $as_echo "122. EXPRTest.at:147: testing ..."
   $at_traceon
 
 
@@ -12328,79 +16065,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: mv stdout \$abs_srcdir/expr-testsuite/data.22.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp" "EXPRTest.at:147"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.22.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:147"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.22.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:147: diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.22.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr" "EXPRTest.at:147"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:147 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.22.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.22.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:147"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_122
 #AT_START_123
-at_fn_group_banner 123 'EXPRTest.at:148' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)" ""
+# 123. EXPRTest.at:148: expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" (pass)
+at_setup_line='EXPRTest.at:148'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "123: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $as_echo "123. EXPRTest.at:148: testing ..."
   $at_traceon
 
 
@@ -12412,79 +16181,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: mv stdout \$abs_srcdir/expr-testsuite/data.23.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp" "EXPRTest.at:148"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr" "EXPRTest.at:148"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_123
 #AT_START_124
-at_fn_group_banner 124 'EXPRTest.at:148' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)" ""
+# 124. EXPRTest.at:148: expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" (pass)
+at_setup_line='EXPRTest.at:148'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "124: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "124. EXPRTest.at:148: testing ..."
   $at_traceon
 
 
@@ -12496,79 +16297,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: mv stdout \$abs_srcdir/expr-testsuite/data.23.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp" "EXPRTest.at:148"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.23.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:148"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.23.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:148: diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.23.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr" "EXPRTest.at:148"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:148 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.23.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.23.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:148"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_124
 #AT_START_125
-at_fn_group_banner 125 'EXPRTest.at:149' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)" ""
+# 125. EXPRTest.at:149: expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" (pass)
+at_setup_line='EXPRTest.at:149'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "125: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. EXPRTest.at:149: testing ..."
   $at_traceon
 
 
@@ -12580,79 +16413,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: mv stdout \$abs_srcdir/expr-testsuite/data.24.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp" "EXPRTest.at:149"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr" "EXPRTest.at:149"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_125
 #AT_START_126
-at_fn_group_banner 126 'EXPRTest.at:149' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)" ""
+# 126. EXPRTest.at:149: expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" (pass)
+at_setup_line='EXPRTest.at:149'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "126: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. EXPRTest.at:149: testing ..."
   $at_traceon
 
 
@@ -12664,79 +16529,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: mv stdout \$abs_srcdir/expr-testsuite/data.24.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp" "EXPRTest.at:149"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.24.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:149"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.24.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:149: diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.24.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr" "EXPRTest.at:149"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:149 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.24.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.24.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:149"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_126
 #AT_START_127
-at_fn_group_banner 127 'EXPRTest.at:153' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)" ""
+# 127. EXPRTest.at:153: expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" (pass)
+at_setup_line='EXPRTest.at:153'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "127: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. EXPRTest.at:153: testing ..."
   $at_traceon
 
 
@@ -12748,79 +16645,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: mv stdout \$abs_srcdir/expr-testsuite/data.25.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp" "EXPRTest.at:153"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr" "EXPRTest.at:153"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_127
 #AT_START_128
-at_fn_group_banner 128 'EXPRTest.at:153' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)" ""
+# 128. EXPRTest.at:153: expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" (pass)
+at_setup_line='EXPRTest.at:153'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "128: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. EXPRTest.at:153: testing ..."
   $at_traceon
 
 
@@ -12832,79 +16761,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: mv stdout \$abs_srcdir/expr-testsuite/data.25.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp" "EXPRTest.at:153"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.25.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:153"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.25.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:153: diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.25.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr" "EXPRTest.at:153"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:153 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.25.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.25.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:153"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_128
 #AT_START_129
-at_fn_group_banner 129 'EXPRTest.at:154' \
-  "expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)" ""
+# 129. EXPRTest.at:154: expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" (pass)
+at_setup_line='EXPRTest.at:154'
+at_desc="expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "129: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. EXPRTest.at:154: testing ..."
   $at_traceon
 
 
@@ -12916,79 +16877,111 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: mv stdout \$abs_srcdir/expr-testsuite/data.26.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp" "EXPRTest.at:154"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -w \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
-( $at_check_trace; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -w $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr" "EXPRTest.at:154"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_129
 #AT_START_130
-at_fn_group_banner 130 'EXPRTest.at:154' \
-  "expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)" ""
+# 130. EXPRTest.at:154: expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" (pass)
+at_setup_line='EXPRTest.at:154'
+at_desc="expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" (pass)"
+$at_quiet $as_echo_n "130: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. EXPRTest.at:154: testing ..."
   $at_traceon
 
 
@@ -13000,69 +16993,98 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    if test -n "$baselines" -a x$baselines = xyes; then :
+    if test -n "$baselines" -a x$baselines = xyes; then
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: mv stdout \$abs_srcdir/expr-testsuite/data.26.base.tmp"
-at_fn_check_prepare_dynamic "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp" "EXPRTest.at:154"
-( $at_check_trace; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp"; then
+  ( $at_traceon; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; mv stdout $abs_srcdir/expr-testsuite/data.26.base.tmp ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
+at_func_diff_devnull "$at_stdout" || at_failed=:
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 else
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: \$abs_builddir/expr-test -b -W \$abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"
-at_fn_check_prepare_dynamic "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true" "EXPRTest.at:154"
-( $at_check_trace; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k \"\" -f \"dummy\" || true"; then
+  ( $at_traceon; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/expr-test -b -W $abs_srcdir/expr-testsuite/test.26.dds -k "" -f "dummy" || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-        { set +x
+        { $at_traceoff
 $as_echo "$at_srcdir/EXPRTest.at:154: diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B \$abs_srcdir/expr-testsuite/data.26.base stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr" "EXPRTest.at:154"
-( $at_check_trace; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo EXPRTest.at:154 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/expr-testsuite/data.26.base stdout || diff -b -B $abs_srcdir/expr-testsuite/data.26.base stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/EXPRTest.at:154"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
 
 fi
 
-      set +x
+
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_130
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7cc59e5..14725b8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -592,7 +592,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/tests/dmr-testsuite/.DS_Store b/tests/dmr-testsuite/.DS_Store
deleted file mode 100644
index a1a4fd9..0000000
Binary files a/tests/dmr-testsuite/.DS_Store and /dev/null differ
diff --git a/tests/dmr-testsuite/._.DS_Store b/tests/dmr-testsuite/._.DS_Store
deleted file mode 100644
index 09fa6bd..0000000
Binary files a/tests/dmr-testsuite/._.DS_Store and /dev/null differ
diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base
new file mode 100644
index 0000000..fddf8f8
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.1.trans_base
@@ -0,0 +1,33 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d5c902a7</Value>
+        </Attribute>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d2207316</Value>
+        </Attribute>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+The data:
+{ {99.999, 99.999, 99.999, 99.999, 99.999}, {"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base
new file mode 100644
index 0000000..90e228f
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.2.trans_base
@@ -0,0 +1,27 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="2"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>55708e52</Value>
+        </Attribute>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+The data:
+{ {"Silly test string: 1", "Silly test string: 1"} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base
new file mode 100644
index 0000000..80ade42
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.3.trans_base
@@ -0,0 +1,25 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <String name="x">
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>55708e52</Value>
+        </Attribute>
+    </String>
+</Dataset>
+
+The data:
+{ {"Silly test string: 1", "Silly test string: 1"} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base
new file mode 100644
index 0000000..80ade42
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.4.trans_base
@@ -0,0 +1,25 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <String name="x">
+        <Dim size="2"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>55708e52</Value>
+        </Attribute>
+    </String>
+</Dataset>
+
+The data:
+{ {"Silly test string: 1", "Silly test string: 1"} }
diff --git a/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base
new file mode 100644
index 0000000..8943261
--- /dev/null
+++ b/tests/dmr-testsuite/big-endian/test_array_3.1.dmr.5.trans_base
@@ -0,0 +1,27 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <Float32 name="row">
+        <Dim name="/row"/>
+    </Float32>
+    <String name="x">
+        <Dim name="/row"/>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_3">
+    <Dimension name="row" size="5"/>
+    <String name="x">
+        <Dim name="/row"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>d2207316</Value>
+        </Attribute>
+        <Map name="/row"/>
+    </String>
+</Dataset>
+
+The data:
+{ {"Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1", "Silly test string: 1"} }
diff --git a/tests/dmr-testsuite/names_with_spaces.dmr b/tests/dmr-testsuite/names_with_spaces.dmr
new file mode 100644
index 0000000..4400795
--- /dev/null
+++ b/tests/dmr-testsuite/names_with_spaces.dmr
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/30/13 -->
+
+<Dataset name="vol_1_ce_2" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_2.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  <Dimension name="d" size="5"/>
+  
+  <Int32 name="u">
+      <Dim name="d"/>
+  </Int32>
+  <Int32 name="v"/>
+
+  <Group name="inst2">
+    <Int32 name="u">
+        <Dim size="2"/>
+    </Int32>
+    
+    <Int32 name="v"/>
+
+    <Structure name="Point">
+      <Int32 name="x">
+          <Dim name="/d"/>
+      </Int32>
+      
+      <Int32 name="y"/>
+      
+    </Structure>
+  </Group>
+</Dataset>
+
diff --git a/tests/dmr-testsuite/names_with_spaces2.dmr b/tests/dmr-testsuite/names_with_spaces2.dmr
new file mode 100644
index 0000000..36205e5
--- /dev/null
+++ b/tests/dmr-testsuite/names_with_spaces2.dmr
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/30/13 -->
+
+<Dataset name="vol_1_ce_2" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_2.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="d" size="5"/>
+  
+  <Int32 name="u">
+      <Dim name="d"/>
+  </Int32>
+  <Int32 name="v"/>
+
+  <Group name="inst2">
+    <Int32 name="u">
+        <Dim size="2"/>
+    </Int32>
+    
+    <Int32 name="v"/>
+
+    <Structure name="Point Break">
+      <Int32 name="x">
+          <Dim name="/d"/>
+      </Int32>
+      
+      <Int32 name="y"/>
+      
+    </Structure>
+  </Group>
+
+</Dataset>
+
diff --git a/tests/dmr-testsuite/names_with_spaces3.dmr b/tests/dmr-testsuite/names_with_spaces3.dmr
new file mode 100644
index 0000000..b3d52d3
--- /dev/null
+++ b/tests/dmr-testsuite/names_with_spaces3.dmr
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Example in the CE section of the DAP4 spec. jhrg 12/30/13 -->
+
+<Dataset name="vol_1_ce_2" dapVersion="4.0" dmrVersion="1.0" xml:base="file:dap4/vol_1_ce_2.xml"
+  xmlns="http://xml.opendap.org/ns/DAP/4.0#" xmlns:dap="http://xml.opendap.org/ns/DAP/4.0#">
+  
+  <Dimension name="d" size="5"/>
+  
+  <Int32 name="u">
+      <Dim name="d"/>
+  </Int32>
+  <Int32 name="v"/>
+
+  <Group name="inst2">
+    <Int32 name="u">
+        <Dim size="2"/>
+    </Int32>
+    
+    <Int32 name="v"/>
+
+    <Group name="New Group">
+      <Int32 name="x">
+          <Dim name="/d"/>
+      </Int32>
+      
+      <Int32 name="y"/>
+      
+    </Group>
+  </Group>
+
+</Dataset>
+
diff --git a/tests/dmr-testsuite/universal/names_with_spaces.dmr.1.trans_base b/tests/dmr-testsuite/universal/names_with_spaces.dmr.1.trans_base
new file mode 100644
index 0000000..9dfa509
--- /dev/null
+++ b/tests/dmr-testsuite/universal/names_with_spaces.dmr.1.trans_base
@@ -0,0 +1,35 @@
+Parse successful
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/vol_1_ce_2.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_2">
+    <Dimension name="d" size="5"/>
+    <Int32 name="u">
+        <Dim name="/d"/>
+    </Int32>
+    <Int32 name="v"/>
+    <Group name="inst2">
+        <Int32 name="u">
+            <Dim size="2"/>
+        </Int32>
+        <Int32 name="v"/>
+        <Structure name="Point">
+            <Int32 name="x">
+                <Dim name="/d"/>
+            </Int32>
+            <Int32 name="y"/>
+        </Structure>
+    </Group>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/vol_1_ce_2.xml" dapVersion="4.0" dmrVersion="1.0" name="vol_1_ce_2">
+    <Dimension name="d" size="5"/>
+    <Int32 name="u">
+        <Dim name="/d"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            
+        </Attribute>
+    </Int32>
+</Dataset>
+
+The data:
+{ {32, 1024, 32768, 1048576, 33554432} }
diff --git a/tests/dmr-testsuite/universal/test_simple_7.xml.f.trans_base~ b/tests/dmr-testsuite/universal/test_simple_7.xml.f.trans_base~
deleted file mode 100644
index c481f99..0000000
--- a/tests/dmr-testsuite/universal/test_simple_7.xml.f.trans_base~
+++ /dev/null
@@ -1,22 +0,0 @@
-Parse successful
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_7">
-    <Sequence name="s">
-        <Int32 name="i1"/>
-        <String name="s"/>
-    </Sequence>
-</Dataset>
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_7.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_7">
-    <Sequence name="s">
-        <Int32 name="i1"/>
-        <String name="s"/>
-        <Attribute name="DAP4_Checksum_CRC32" type="String">
-            <Value>56ba48cb</Value>
-        </Attribute>
-    </Sequence>
-</Dataset>
-
-The data:
-{ { { 32, "Silly test string: 1" }, { 1024, "Silly test string: 2" }, { 32768, "Silly test string: 3" }, { 1048576, "Silly test string: 4" } } }
diff --git a/tests/expr-testsuite/data.21.base~ b/tests/expr-testsuite/data.21.base~
deleted file mode 100644
index f1f88c6..0000000
--- a/tests/expr-testsuite/data.21.base~
+++ /dev/null
@@ -1,6 +0,0 @@
-The complete DDS:
-Dataset {
-    Int32 a[0];
-} test.21;
-The data:
-Int32 a[0] = {
\ No newline at end of file
diff --git a/tests/expr-testsuite/data.24.base.tmp~ b/tests/expr-testsuite/data.24.base.tmp~
deleted file mode 100644
index e29b74a..0000000
--- a/tests/expr-testsuite/data.24.base.tmp~
+++ /dev/null
@@ -1,10 +0,0 @@
-The complete DDS:
-Dataset {
-    Int32 a;
-    Int32 b[10];
-    Int32 c[0][4];
-} test.22;
-The data:
-Int32 a = 32;
-Int32 b[10] = {32, 1024, 32768, 1048576, 33554432, 1073741824, 32, 1024, 32768, 1048576};
-Int32 c[0][4] = {{
\ No newline at end of file
diff --git a/tests/getdapTest b/tests/getdapTest
index 8d94f4b..72dd041 100755
--- a/tests/getdapTest
+++ b/tests/getdapTest
@@ -1,17 +1,17 @@
 #! /bin/sh
-# Generated from getdapTest.at by GNU Autoconf 2.69.
-#
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Generated from getdapTest.at by GNU Autoconf 2.63.
 #
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
 # This test suite is free software; the Free Software Foundation gives
 # unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -19,15 +19,23 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
+
 fi
 
 
+
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
 as_nl='
 '
 export as_nl
@@ -35,13 +43,7 @@ export as_nl
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -52,7 +54,7 @@ else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in #(
+      case $arg in
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -75,6 +77,13 @@ if test "${PATH_SEPARATOR+set}" != set; then
   }
 fi
 
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -84,16 +93,15 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
+case $0 in
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 IFS=$as_save_IFS
 
      ;;
@@ -105,16 +113,12 @@ if test "x$as_myself" = x; then
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
+  { (exit 1); exit 1; }
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 done
 PS1='$ '
 PS2='> '
@@ -126,319 +130,330 @@ export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+$as_unset CDPATH
+
 
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
 else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_have_required=no
 fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
+
+  if test $as_have_required = yes &&	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
 exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
 
+if as_func_ret_success; then
+  :
 else
-  exitcode=1; echo positional parameters were not saved.
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_have_required=no
+  exitcode=1
+  echo positional parameters were not saved.
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
+  as_candidate_shells=
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
+  case $as_dir in
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
 	   done;;
        esac
-  as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
 esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
+fi
+
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
 fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
 fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
 
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
 
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
+test $exitcode = 0) || { (exit 1); exit 1; }
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
+(
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+
+_ASEOF
+}; then
+  break
+fi
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+fi
 
+      done
 
-} # as_fn_mkdir_p
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
 
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
 
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
 else
-  as_expr=false
+  exitcode=1
+  echo as_func_success failed.
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
 else
-  as_basename=false
+  exitcode=1
+  echo as_func_ret_success failed.
 fi
 
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
 else
-  as_dirname=false
+  exitcode=1
+  echo positional parameters were not saved.
 fi
 
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
+}
+
+
 
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -455,12 +470,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { { $as_echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+$as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -469,18 +482,29 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
+case `echo -n x` in
 -n*)
-  case `echo 'xy\c'` in
+  case `echo 'x\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
+  *)   ECHO_C='\c';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -495,29 +519,49 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -547,11 +591,6 @@ at_errexit_p=false
 # Shall we be verbose?  ':' means no, empty means yes.
 at_verbose=:
 at_quiet=
-# Running several jobs in parallel, 0 means as many as test groups.
-at_jobs=1
-at_traceon=:
-at_trace_echo=:
-at_check_filter_trace=:
 
 # Shall we keep the debug scripts?  Must be `:' when the suite is
 # run by a debug script, so that the script doesn't remove itself.
@@ -566,8 +605,6 @@ at_list_p=false
 at_clean=false
 # Test groups to run
 at_groups=
-# Whether to rerun failed tests.
-at_recheck=
 # Whether a write failure occurred
 at_write_fail=0
 
@@ -581,10 +618,10 @@ esac
 # Whether -C is in effect.
 at_change_dir=false
 
-# Whether to enable colored test results.
-at_color=no
 # List of the tested programs.
 at_tested=''
+# List of the all the test groups.
+at_groups_all=' 1'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -592,14 +629,12 @@ at_format='?'
 # Description of all the test groups.
 at_help_all="1;getdapTest.at:34;getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass);getdap;
 "
-# List of the all the test groups.
-at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
 
-# at_fn_validate_ranges NAME...
-# -----------------------------
-# Validate and normalize the test group number contained in each variable
-# NAME. Leading zeroes are treated as decimal.
-at_fn_validate_ranges ()
+# at_func_validate_ranges [NAME...]
+# ---------------------------------
+# Validate and normalize the test group number contained in each
+# variable NAME.  Leading zeroes are treated as decimal.
+at_func_validate_ranges ()
 {
   for at_grp
   do
@@ -610,7 +645,7 @@ at_fn_validate_ranges ()
     fi
     case $at_value in
       0*) # We want to treat leading 0 as decimal, like expr and test, but
-	  # AS_VAR_ARITH treats it as octal if it uses $(( )).
+	  # at_func_arith treats it as octal if it uses $(( )).
 	  # With XSI shells, ${at_value#${at_value%%[1-9]*}} avoids the
 	  # expr fork, but it is not worth the effort to determine if the
 	  # shell supports XSI when the user can just avoid leading 0.
@@ -629,8 +664,8 @@ do
   fi
 
   case $at_option in
-  *=?*) at_optarg=`expr "X$at_option" : '[^=]*=\(.*\)'` ;;
-  *)    at_optarg= ;;
+  *=*) at_optarg=`expr "x$at_option" : 'x[^=]*=\(.*\)'` ;;
+  *)   at_optarg= ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -652,19 +687,6 @@ do
 	at_clean=:
 	;;
 
-    --color )
-	at_color=always
-	;;
-    --color=* )
-	case $at_optarg in
-	no | never | none) at_color=never ;;
-	auto | tty | if-tty) at_color=auto ;;
-	always | yes | force) at_color=always ;;
-	*) at_optname=`echo " $at_option" | sed 's/^ //; s/=.*//'`
-	   as_fn_error $? "unrecognized argument to $at_optname: $at_optarg" ;;
-	esac
-	;;
-
     --debug | -d )
 	at_debug_p=:
 	;;
@@ -679,31 +701,29 @@ do
 	;;
 
     --trace | -x )
-	at_traceon='set -x'
-	at_trace_echo=echo
-	at_check_filter_trace=at_fn_filter_trace
+	at_traceon='set -x'; at_traceoff='set +x'
 	;;
 
     [0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9])
-	at_fn_validate_ranges at_option
-	as_fn_append at_groups "$at_option$as_nl"
+	at_func_validate_ranges at_option
+	at_groups="$at_groups$at_option "
 	;;
 
     # Ranges
     [0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-)
 	at_range_start=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_start
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,$p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.* \('$at_range_start' \)/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9])
 	at_range_end=`echo $at_option |tr -d X-`
-	at_fn_validate_ranges at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '1,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     [0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9] | \
@@ -719,10 +739,11 @@ do
 	  at_range_end=$at_range_start
 	  at_range_start=$at_tmp
 	fi
-	at_fn_validate_ranges at_range_start at_range_end
-	at_range=`$as_echo "$at_groups_all" | \
-	  sed -ne '/^'$at_range_start'$/,/^'$at_range_end'$/p'`
-	as_fn_append at_groups "$at_range$as_nl"
+	at_func_validate_ranges at_range_start at_range_end
+	at_range=`$as_echo " $at_groups_all " | \
+	  sed -e 's/^.*\( '$at_range_start' \)/\1/' \
+	      -e 's/\( '$at_range_end'\) .*$/\1/'`
+	at_groups="$at_groups$at_range "
 	;;
 
     # Directory selection.
@@ -732,25 +753,6 @@ do
     --directory=* )
 	at_change_dir=:
 	at_dir=$at_optarg
-	if test x- = "x$at_dir" ; then
-	  at_dir=./-
-	fi
-	;;
-
-    # Parallel execution.
-    --jobs | -j )
-	at_jobs=0
-	;;
-    --jobs=* | -j[0-9]* )
-	if test -n "$at_optarg"; then
-	  at_jobs=$at_optarg
-	else
-	  at_jobs=`expr X$at_option : 'X-j\(.*\)'`
-	fi
-	case $at_jobs in *[!0-9]*)
-	  at_optname=`echo " $at_option" | sed 's/^ //; s/[0-9=].*//'`
-	  as_fn_error $? "non-numeric argument to $at_optname: $at_jobs" ;;
-	esac
 	;;
 
     # Keywords.
@@ -777,12 +779,11 @@ do
 	  at_groups_selected=`$as_echo "$at_groups_selected" |
 	      grep -i $at_invert "^[1-9][^;]*;.*[; ]$at_keyword[ ;]"`
 	done
-	# Smash the keywords.
-	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//'`
-	as_fn_append at_groups "$at_groups_selected$as_nl"
-	;;
-    --recheck)
-	at_recheck=:
+	# Smash the newlines.
+	at_groups_selected=`$as_echo "$at_groups_selected" | sed 's/;.*//' |
+	  tr "$as_nl" ' '
+	`
+	at_groups="$at_groups$at_groups_selected "
 	;;
 
     *=*)
@@ -790,12 +791,14 @@ do
 	# Reject names that are not valid shell variable names.
 	case $at_envvar in
 	  '' | [0-9]* | *[!_$as_cr_alnum]* )
-	    as_fn_error $? "invalid variable name: \`$at_envvar'" ;;
+	    { { $as_echo "$as_me:$LINENO: error: invalid variable name: $at_envvar" >&5
+$as_echo "$as_me: error: invalid variable name: $at_envvar" >&2;}
+   { (exit 1); exit 1; }; } ;;
 	esac
 	at_value=`$as_echo "$at_optarg" | sed "s/'/'\\\\\\\\''/g"`
 	# Export now, but save eval for later and for debug scripts.
 	export $at_envvar
-	as_fn_append at_debug_args " $at_envvar='$at_value'"
+	at_debug_args="$at_debug_args $at_envvar='$at_value'"
 	;;
 
      *) $as_echo "$as_me: invalid option: $at_option" >&2
@@ -806,42 +809,19 @@ do
 done
 
 # Verify our last option didn't require an argument
-if test -n "$at_prev"; then :
-  as_fn_error $? "\`$at_prev' requires an argument"
+if test -n "$at_prev"; then
+  { { $as_echo "$as_me:$LINENO: error: \`$at_prev' requires an argument." >&5
+$as_echo "$as_me: error: \`$at_prev' requires an argument." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-# The file containing the suite.
-at_suite_log=$at_dir/$as_me.log
 
 # Selected test groups.
-if test -z "$at_groups$at_recheck"; then
+if test -z "$at_groups"; then
   at_groups=$at_groups_all
 else
-  if test -n "$at_recheck" && test -r "$at_suite_log"; then
-    at_oldfails=`sed -n '
-      /^Failed tests:$/,/^Skipped tests:$/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^Unexpected passes:$/,/^## Detailed failed tests/{
-	s/^[ ]*\([1-9][0-9]*\):.*/\1/p
-      }
-      /^## Detailed failed tests/q
-      ' "$at_suite_log"`
-    as_fn_append at_groups "$at_oldfails$as_nl"
-  fi
   # Sort the tests, removing duplicates.
-  at_groups=`$as_echo "$at_groups" | sort -nu | sed '/^$/d'`
-fi
-
-if test x"$at_color" = xalways \
-   || { test x"$at_color" = xauto && test -t 1; }; then
-  at_red=`printf '\033[0;31m'`
-  at_grn=`printf '\033[0;32m'`
-  at_lgn=`printf '\033[1;32m'`
-  at_blu=`printf '\033[1;34m'`
-  at_std=`printf '\033[m'`
-else
-  at_red= at_grn= at_lgn= at_blu= at_std=
+  at_groups=`$as_echo "$at_groups" | tr ' ' "$as_nl" | sort -nu`
 fi
 
 # Help message.
@@ -852,17 +832,16 @@ Usage: $0 [OPTION]... [VARIABLE=VALUE]... [TESTS]
 Run all the tests, or the selected TESTS, given by numeric ranges, and
 save a detailed log file.  Upon failure, create debugging scripts.
 
-Do not change environment variables directly.  Instead, set them via
-command line arguments.  Set \`AUTOTEST_PATH' to select the executables
+You should not change environment variables unless explicitly passed
+as command line arguments.  Set \`AUTOTEST_PATH' to select the executables
 to exercise.  Each relative directory is expanded as build and source
-directories relative to the top level of this distribution.
-E.g., from within the build directory /tmp/foo-1.0, invoking this:
+directories relatively to the top level of this distribution.  E.g.,
 
   $ $0 AUTOTEST_PATH=bin
 
-is equivalent to the following, assuming the source directory is /src/foo-1.0:
+possibly amounts into
 
-  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH $0
+  PATH=/tmp/foo-1.0/bin:/src/foo-1.0/bin:\$PATH
 _ATEOF
 cat <<_ATEOF || at_write_fail=1
 
@@ -877,14 +856,9 @@ cat <<_ATEOF || at_write_fail=1
 Execution tuning:
   -C, --directory=DIR
                  change to directory DIR before starting
-      --color[=never|auto|always]
-                 enable colored test results on terminal, or always
-  -j, --jobs[=N]
-                 Allow N jobs at once; infinite jobs with no arg (default 1)
   -k, --keywords=KEYWORDS
                  select the tests matching all the comma-separated KEYWORDS
                  multiple \`-k' accumulate; prefixed \`!' negates a KEYWORD
-      --recheck  select all tests that failed or passed unexpectedly last time
   -e, --errexit  abort as soon as a test fails; implies --debug
   -v, --verbose  force more detailed output
                  default for debugging scripts
@@ -902,69 +876,64 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-libdap 3.18.1 test suite: getdap test groups:
+libdap 3.18.2 test suite: getdap test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
 
 _ATEOF
-  # Pass an empty line as separator between selected groups and help.
-  $as_echo "$at_groups$as_nl$as_nl$at_help_all" |
-    awk 'NF == 1 && FS != ";" {
-	   selected[$ 1] = 1
+  # Passing at_groups is tricky.  We cannot use it to form a literal string
+  # or regexp because of the limitation of AIX awk.  And Solaris' awk
+  # doesn't grok more than 99 fields in a record, so we have to use `split'.
+  # at_groups needs to be space-separated for this script to work.
+  case $at_groups in
+    *"$as_nl"* )
+      at_groups=`$as_echo "$at_groups" | tr "$as_nl" ' '` ;;
+  esac
+  $as_echo "$at_groups$as_nl$at_help_all" |
+    awk 'BEGIN { FS = ";" }
+	 NR == 1 {
+	   for (n = split($ 0, a, " "); n; n--) selected[a[n]] = 1
 	   next
 	 }
-	 /^$/ { FS = ";" }
-	 NF > 0 {
+	 {
 	   if (selected[$ 1]) {
 	     printf " %3d: %-18s %s\n", $ 1, $ 2, $ 3
-	     if ($ 4) {
-	       lmax = 79
-	       indent = "     "
-	       line = indent
-	       len = length (line)
-	       n = split ($ 4, a, " ")
-	       for (i = 1; i <= n; i++) {
-		 l = length (a[i]) + 1
-		 if (i > 1 && len + l > lmax) {
-		   print line
-		   line = indent " " a[i]
-		   len = length (line)
-		 } else {
-		   line = line " " a[i]
-		   len += l
-		 }
-	       }
-	       if (n)
-		 print line
-	     }
+	     if ($ 4) printf "      %s\n", $ 4
 	   }
 	 }' || at_write_fail=1
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (libdap 3.18.1)" &&
-  cat <<\_ATEOF || at_write_fail=1
+  $as_echo "$as_me (libdap 3.18.2)" &&
+  cat <<\_ACEOF || at_write_fail=1
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+Free Software Foundation, Inc.
 This test suite is free software; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
-_ATEOF
+_ACEOF
   exit $at_write_fail
 fi
 
-# Should we print banners?  Yes if more than one test is run.
-case $at_groups in #(
-  *$as_nl* )
-      at_print_banners=: ;; #(
+# Should we print banners?  at_groups is space-separated for entire test,
+# newline-separated if only a subset of the testsuite is run.
+case $at_groups in
+  *' '*' '* | *"$as_nl"*"$as_nl"* )
+      at_print_banners=: ;;
   * ) at_print_banners=false ;;
 esac
-# Text for banner N, set to a single space once printed.
+# Text for banner N, set to empty once printed.
 
 # Take any -C into account.
 if $at_change_dir ; then
+  if test x- = "x$at_dir" ; then
+    at_dir=./-
+  fi
   test x != "x$at_dir" && cd "$at_dir" \
-    || as_fn_error $? "unable to change directory"
+    || { { $as_echo "$as_me:$LINENO: error: unable to change directory" >&5
+$as_echo "$as_me: error: unable to change directory" >&2;}
+   { (exit 1); exit 1; }; }
   at_dir=`pwd`
 fi
 
@@ -972,11 +941,13 @@ fi
 for at_file in atconfig atlocal
 do
   test -r $at_file || continue
-  . ./$at_file || as_fn_error $? "invalid content: $at_file"
+  . ./$at_file || { { $as_echo "$as_me:$LINENO: error: invalid content: $at_file" >&5
+$as_echo "$as_me: error: invalid content: $at_file" >&2;}
+   { (exit 1); exit 1; }; }
 done
 
 # Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
-: "${at_top_build_prefix=$at_top_builddir}"
+: ${at_top_build_prefix=$at_top_builddir}
 
 # Perform any assignments requested during argument parsing.
 eval "$at_debug_args"
@@ -987,7 +958,8 @@ if test -n "$at_top_srcdir"; then
   builddir=../..
   for at_dir_var in srcdir top_srcdir top_build_prefix
   do
-    eval at_val=\$at_$at_dir_var
+    at_val=`eval 'as_val=${'at_$at_dir_var'}
+		 $as_echo "$as_val"'`
     case $at_val in
       [\\/$]* | ?:[\\/]* ) at_prefix= ;;
       *) at_prefix=../../ ;;
@@ -996,9 +968,9 @@ if test -n "$at_top_srcdir"; then
   done
 fi
 
-## -------------------- ##
-## Directory structure. ##
-## -------------------- ##
+## ------------------- ##
+## Directory structure ##
+## ------------------- ##
 
 # This is the set of directories and files used by this script
 # (non-literals are capitalized):
@@ -1029,14 +1001,12 @@ fi
 # The directory the whole suite works in.
 # Should be absolute to let the user `cd' at will.
 at_suite_dir=$at_dir/$as_me.dir
-# The file containing the suite ($at_dir might have changed since earlier).
+# The file containing the suite.
 at_suite_log=$at_dir/$as_me.log
 # The directory containing helper files per test group.
 at_helper_dir=$at_suite_dir/at-groups
 # Stop file: if it exists, do not start new jobs.
 at_stop_file=$at_suite_dir/at-stop
-# The fifo used for the job dispatcher.
-at_job_fifo=$at_suite_dir/at-job-fifo
 
 if $at_clean; then
   test -d "$at_suite_dir" &&
@@ -1060,23 +1030,23 @@ for as_dir in $AUTOTEST_PATH $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -n "$at_path" && as_fn_append at_path $PATH_SEPARATOR
+  test -n "$at_path" && at_path=$at_path$PATH_SEPARATOR
 case $as_dir in
   [\\/]* | ?:[\\/]* )
-    as_fn_append at_path "$as_dir"
+    at_path=$at_path$as_dir
     ;;
   * )
     if test -z "$at_top_build_prefix"; then
       # Stand-alone test suite.
-      as_fn_append at_path "$as_dir"
+      at_path=$at_path$as_dir
     else
       # Embedded test suite.
-      as_fn_append at_path "$at_top_build_prefix$as_dir$PATH_SEPARATOR"
-      as_fn_append at_path "$at_top_srcdir/$as_dir"
+      at_path=$at_path$at_top_build_prefix$as_dir$PATH_SEPARATOR
+      at_path=$at_path$at_top_srcdir/$as_dir
     fi
     ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 
@@ -1090,7 +1060,7 @@ for as_dir in $at_path
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -d "$as_dir" || continue
+  test -d "$as_dir" || continue
 case $as_dir in
   [\\/]* | ?:[\\/]* ) ;;
   * ) as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` ;;
@@ -1098,18 +1068,15 @@ esac
 case $PATH_SEPARATOR$at_new_path$PATH_SEPARATOR in
   *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR*) ;;
   $PATH_SEPARATOR$PATH_SEPARATOR) at_new_path=$as_dir ;;
-  *) as_fn_append at_new_path "$PATH_SEPARATOR$as_dir" ;;
+  *) at_new_path=$at_new_path$PATH_SEPARATOR$as_dir ;;
 esac
-  done
+done
 IFS=$as_save_IFS
 
 PATH=$at_new_path
 export PATH
 
 # Setting up the FDs.
-
-
-
 # 5 is the log file.  Not to be overwritten if `-d'.
 if $at_debug_p; then
   at_suite_log=/dev/null
@@ -1119,28 +1086,43 @@ fi
 exec 5>>"$at_suite_log"
 
 # Banners and logs.
-$as_echo "## --------------------------------- ##
-## libdap 3.18.1 test suite: getdap. ##
-## --------------------------------- ##"
+cat <<\_ASBOX
+## --------------------------------- ##
+## libdap 3.18.2 test suite: getdap. ##
+## --------------------------------- ##
+_ASBOX
 {
-  $as_echo "## --------------------------------- ##
-## libdap 3.18.1 test suite: getdap. ##
-## --------------------------------- ##"
+  cat <<\_ASBOX
+## --------------------------------- ##
+## libdap 3.18.2 test suite: getdap. ##
+## --------------------------------- ##
+_ASBOX
   echo
 
   $as_echo "$as_me: command line was:"
   $as_echo "  \$ $0 $at_cli_args"
   echo
 
-  # If ChangeLog exists, list a few lines in case it might help determining
-  # the exact version.
-  if test -n "$at_top_srcdir" && test -f "$at_top_srcdir/ChangeLog"; then
-    $as_echo "## ---------- ##
-## ChangeLog. ##
-## ---------- ##"
-    echo
-    sed 's/^/| /;10q' "$at_top_srcdir/ChangeLog"
+  # Try to find a few ChangeLogs in case it might help determining the
+  # exact version.  Use the relative dir: if the top dir is a symlink,
+  # find will not follow it (and options to follow the links are not
+  # portable), which would result in no output here.  Prune directories
+  # matching the package tarname, since they tend to be leftovers from
+  # `make dist' or `make distcheck' and contain redundant or stale logs.
+  if test -n "$at_top_srcdir"; then
+    cat <<\_ASBOX
+## ----------- ##
+## ChangeLogs. ##
+## ----------- ##
+_ASBOX
     echo
+    for at_file in `find "$at_top_srcdir" -name "libdap-*" -prune -o -name ChangeLog -print`
+    do
+      $as_echo "$as_me: $at_file:"
+      sed 's/^/| /;10q' $at_file
+      echo
+    done
+
   fi
 
   {
@@ -1173,8 +1155,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
+  $as_echo "PATH: $as_dir"
+done
 IFS=$as_save_IFS
 
 }
@@ -1191,80 +1173,53 @@ IFS=$as_save_IFS
 } >&5
 
 
-## ------------------------- ##
-## Autotest shell functions. ##
-## ------------------------- ##
+## --------------- ##
+## Shell functions ##
+## --------------- ##
 
-# at_fn_banner NUMBER
-# -------------------
-# Output banner NUMBER, provided the testsuite is running multiple groups and
-# this particular banner has not yet been printed.
-at_fn_banner ()
+# at_func_banner NUMBER
+# ---------------------
+# Output banner NUMBER, provided the testsuite is running multiple groups
+# and this particular banner has not yet been printed.
+at_func_banner ()
 {
   $at_print_banners || return 0
   eval at_banner_text=\$at_banner_text_$1
-  test "x$at_banner_text" = "x " && return 0
-  eval "at_banner_text_$1=\" \""
-  if test -z "$at_banner_text"; then
-    $at_first || echo
-  else
-    $as_echo "$as_nl$at_banner_text$as_nl"
-  fi
-} # at_fn_banner
-
-# at_fn_check_prepare_notrace REASON LINE
-# ---------------------------------------
-# Perform AT_CHECK preparations for the command at LINE for an untraceable
-# command; REASON is the reason for disabling tracing.
-at_fn_check_prepare_notrace ()
-{
-  $at_trace_echo "Not enabling shell tracing (command contains $1)"
-  $as_echo "$2" >"$at_check_line_file"
-  at_check_trace=: at_check_filter=:
-  : >"$at_stdout"; : >"$at_stderr"
-}
-
-# at_fn_check_prepare_trace LINE
-# ------------------------------
-# Perform AT_CHECK preparations for the command at LINE for a traceable
-# command.
-at_fn_check_prepare_trace ()
-{
-  $as_echo "$1" >"$at_check_line_file"
-  at_check_trace=$at_traceon at_check_filter=$at_check_filter_trace
-  : >"$at_stdout"; : >"$at_stderr"
-}
+  test "x$at_banner_text" = x && return 0
+  eval at_banner_text_$1=
+  $as_echo "$as_nl$at_banner_text$as_nl"
+} # at_func_banner
 
-# at_fn_check_prepare_dynamic COMMAND LINE
-# ----------------------------------------
-# Decide if COMMAND at LINE is traceable at runtime, and call the appropriate
-# preparation function.
-at_fn_check_prepare_dynamic ()
+# at_func_check_newline COMMAND
+# -----------------------------
+# Test if COMMAND includes a newline and, if so, print a message and return
+# exit code 1
+at_func_check_newline ()
 {
-  case $1 in
-    *$as_nl*)
-      at_fn_check_prepare_notrace 'an embedded newline' "$2" ;;
-    *)
-      at_fn_check_prepare_trace "$2" ;;
+  case "$1" in
+ *'
+'*) echo 'Not enabling shell tracing (command contains an embedded newline)'
+    return 1 ;;
+ *) return 0 ;;
   esac
 }
 
-# at_fn_filter_trace
-# ------------------
-# Remove the lines in the file "$at_stderr" generated by "set -x" and print
-# them to stderr.
-at_fn_filter_trace ()
+# at_func_filter_trace EXIT-CODE
+# ------------------------------
+# Split the contents of file "$at_stder1" into the "set -x" trace (on stderr)
+# and the other lines (on file "$at_stderr").  Return the exit code EXIT-CODE.
+at_func_filter_trace ()
 {
-  mv "$at_stderr" "$at_stder1"
   grep '^ *+' "$at_stder1" >&2
   grep -v '^ *+' "$at_stder1" >"$at_stderr"
+  return $1
 }
 
-# at_fn_log_failure FILE-LIST
-# ---------------------------
+# at_func_log_failure FILE-LIST
+# -----------------------------
 # Copy the files in the list on stdout with a "> " prefix, and exit the shell
 # with a failure exit code.
-at_fn_log_failure ()
+at_func_log_failure ()
 {
   for file
     do $as_echo "$file:"; sed 's/^/> /' "$file"; done
@@ -1272,62 +1227,56 @@ at_fn_log_failure ()
   exit 1
 }
 
-# at_fn_check_skip EXIT-CODE LINE
-# -------------------------------
-# Check whether EXIT-CODE is a special exit code (77 or 99), and if so exit
-# the test group subshell with that same exit code. Use LINE in any report
-# about test failure.
-at_fn_check_skip ()
+# at_func_check_skip EXIT-CODE
+# ----------------------------
+# Check whether EXIT-CODE is the special exit code 77, and if so exit the shell
+# with that same exit code.
+at_func_check_skip ()
 {
   case $1 in
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$2: hard failure"; exit 99;;
     77) echo 77 > "$at_status_file"; exit 77;;
   esac
 }
 
-# at_fn_check_status EXPECTED EXIT-CODE LINE
-# ------------------------------------------
-# Check whether EXIT-CODE is the EXPECTED exit code, and if so do nothing.
-# Otherwise, if it is 77 or 99, exit the test group subshell with that same
-# exit code; if it is anything else print an error message referring to LINE,
-# and fail the test.
-at_fn_check_status ()
+# at_func_check_status EXPECTED EXIT-CODE LINE
+# --------------------------------------------
+# Check whether EXIT-CODE is the expected exit code, and if so do nothing.
+# Otherwise, if it is 77 exit the shell with that same exit code; if it is
+# anything else print an error message and fail the test.
+at_func_check_status ()
 {
   case $2 in
     $1 ) ;;
     77) echo 77 > "$at_status_file"; exit 77;;
-    99) echo 99 > "$at_status_file"; at_failed=:
-	$as_echo "$3: hard failure"; exit 99;;
     *) $as_echo "$3: exit code was $2, expected $1"
       at_failed=:;;
   esac
 }
 
-# at_fn_diff_devnull FILE
-# -----------------------
-# Emit a diff between /dev/null and FILE. Uses "test -s" to avoid useless diff
-# invocations.
-at_fn_diff_devnull ()
+# at_func_diff_devnull FILE
+# -------------------------
+# Emit a diff between /dev/null and FILE.  Uses "test -s" to avoid useless
+# diff invocations.
+at_func_diff_devnull ()
 {
   test -s "$1" || return 0
   $at_diff "$at_devnull" "$1"
 }
 
-# at_fn_test NUMBER
-# -----------------
+# at_func_test NUMBER
+# -------------------
 # Parse out test NUMBER from the tail of this file.
-at_fn_test ()
+at_func_test ()
 {
   eval at_sed=\$at_sed$1
   sed "$at_sed" "$at_myself" > "$at_test_source"
 }
 
-# at_fn_create_debugging_script
-# -----------------------------
+# at_func_create_debugging_script
+# -------------------------------
 # Create the debugging script $at_group_dir/run which will reproduce the
 # current test group.
-at_fn_create_debugging_script ()
+at_func_create_debugging_script ()
 {
   {
     echo "#! /bin/sh" &&
@@ -1339,13 +1288,34 @@ at_fn_create_debugging_script ()
   chmod +x "$at_group_dir/run"
 }
 
-## -------------------------------- ##
-## End of autotest shell functions. ##
-## -------------------------------- ##
+# at_func_arith
+# -------------
+# Arithmetic evaluation, avoids expr if the shell is sane.  The
+# interpretation of leading zeroes is unspecified.
+#
+# subshell and eval are needed to keep Solaris sh from bailing out:
+if ( eval 'test $(( 1 + 1 )) = 2' ) 2>/dev/null; then
+  # With "$@", bash does not split positional parameters:
+  eval 'at_func_arith ()
+  {
+    at_func_arith_result=$(( $* ))
+  }'
+else
+  at_func_arith ()
+  {
+    at_func_arith_result=`expr "$@"`
+  }
+fi
+
+## ---------------------- ##
+## End of shell functions ##
+## ---------------------- ##
 {
-  $as_echo "## ---------------- ##
+  cat <<\_ASBOX
+## ---------------- ##
 ## Tested programs. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1353,35 +1323,34 @@ at_fn_create_debugging_script ()
 for at_program in : $at_tested
 do
   test "$at_program" = : && continue
-  case $at_program in
-    [\\/]* | ?:[\\/]* ) $at_program_=$at_program ;;
-    * )
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    test -f "$as_dir/$at_program" && break
-  done
+  test -f "$as_dir/$at_program" && break
+done
 IFS=$as_save_IFS
 
-    at_program_=$as_dir/$at_program ;;
-  esac
-  if test -f "$at_program_"; then
+  if test -f "$as_dir/$at_program"; then
     {
-      $as_echo "$at_srcdir/getdapTest.at:3: $at_program_ --version"
-      "$at_program_" --version </dev/null
+      $as_echo "$at_srcdir/getdapTest.at:3: $as_dir/$at_program --version"
+      "$as_dir/$at_program" --version </dev/null
       echo
     } >&5 2>&1
   else
-    as_fn_error $? "cannot find $at_program" "$LINENO" 5
+    { { $as_echo "$as_me:$LINENO: error: cannot find $at_program" >&5
+$as_echo "$as_me: error: cannot find $at_program" >&2;}
+   { (exit 1); exit 1; }; }
   fi
 done
 
 {
-  $as_echo "## ------------------ ##
+  cat <<\_ASBOX
+## ------------------ ##
 ## Running the tests. ##
-## ------------------ ##"
+## ------------------ ##
+_ASBOX
 } >&5
 
 at_start_date=`date`
@@ -1389,8 +1358,11 @@ at_start_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: starting at: $at_start_date" >&5
 
 # Create the master directory if it doesn't already exist.
-as_dir="$at_suite_dir"; as_fn_mkdir_p ||
-  as_fn_error $? "cannot create \`$at_suite_dir'" "$LINENO" 5
+test -d "$at_suite_dir" ||
+  mkdir "$at_suite_dir" ||
+  { { $as_echo "$as_me:$LINENO: error: cannot create '$at_suite_dir'" >&5
+$as_echo "$as_me: error: cannot create '$at_suite_dir'" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Can we diff with `/dev/null'?  DU 5.0 refuses.
 if diff /dev/null /dev/null >/dev/null 2>&1; then
@@ -1424,40 +1396,28 @@ BEGIN { FS="" }
   if (test == "'"$at_group"'") exit
 }' "$at_myself" > "$at_suite_dir/at-source-lines" &&
 . "$at_suite_dir/at-source-lines" ||
-  as_fn_error $? "cannot create test line number cache" "$LINENO" 5
+  { { $as_echo "$as_me:$LINENO: error: cannot create test line number cache" >&5
+$as_echo "$as_me: error: cannot create test line number cache" >&2;}
+   { (exit 1); exit 1; }; }
 rm -f "$at_suite_dir/at-source-lines"
 
-# Set number of jobs for `-j'; avoid more jobs than test groups.
-set X $at_groups; shift; at_max_jobs=$#
-if test $at_max_jobs -eq 0; then
-  at_jobs=1
-fi
-if test $at_jobs -ne 1 &&
-   { test $at_jobs -eq 0 || test $at_jobs -gt $at_max_jobs; }; then
-  at_jobs=$at_max_jobs
-fi
-
-# If parallel mode, don't output banners, don't split summary lines.
-if test $at_jobs -ne 1; then
-  at_print_banners=false
-  at_quiet=:
-fi
-
 # Set up helper dirs.
 rm -rf "$at_helper_dir" &&
 mkdir "$at_helper_dir" &&
 cd "$at_helper_dir" &&
 { test -z "$at_groups" || mkdir $at_groups; } ||
-as_fn_error $? "testsuite directory setup failed" "$LINENO" 5
+{ { $as_echo "$as_me:$LINENO: error: testsuite directory setup failed" >&5
+$as_echo "$as_me: error: testsuite directory setup failed" >&2;}
+   { (exit 1); exit 1; }; }
 
 # Functions for running a test group.  We leave the actual
 # test group execution outside of a shell function in order
 # to avoid hitting zsh 4.x exit status bugs.
 
-# at_fn_group_prepare
-# -------------------
-# Prepare for running a test group.
-at_fn_group_prepare ()
+# at_func_group_prepare
+# ---------------------
+# Prepare running a test group
+at_func_group_prepare ()
 {
   # The directory for additional per-group helper files.
   at_job_dir=$at_helper_dir/$at_group
@@ -1491,20 +1451,56 @@ at_fn_group_prepare ()
 
 
   # Create a fresh directory for the next test group, and enter.
-  # If one already exists, the user may have invoked ./run from
-  # within that directory; we remove the contents, but not the
-  # directory itself, so that we aren't pulling the rug out from
-  # under the shell's notion of the current directory.
   at_group_dir=$at_suite_dir/$at_group_normalized
   at_group_log=$at_group_dir/$as_me.log
   if test -d "$at_group_dir"; then
-  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx {} \;
-  rm -fr "$at_group_dir"/* "$at_group_dir"/.[!.] "$at_group_dir"/.??*
-fi ||
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: test directory for $at_group_normalized could not be cleaned" >&5
-$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned" >&2;}
+    find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
+    rm -fr "$at_group_dir" ||
+    { $as_echo "$as_me:$LINENO: WARNING: test directory for $at_group_normalized could not be cleaned." >&5
+$as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be cleaned." >&2;}
+  fi
   # Be tolerant if the above `rm' was not able to remove the directory.
-  as_dir="$at_group_dir"; as_fn_mkdir_p
+  { as_dir="$at_group_dir"
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
   echo 0 > "$at_status_file"
 
@@ -1517,29 +1513,9 @@ $as_echo "$as_me: WARNING: test directory for $at_group_normalized could not be
   fi
 }
 
-# at_fn_group_banner ORDINAL LINE DESC PAD [BANNER]
-# -------------------------------------------------
-# Declare the test group ORDINAL, located at LINE with group description DESC,
-# and residing under BANNER. Use PAD to align the status column.
-at_fn_group_banner ()
-{
-  at_setup_line="$2"
-  test -n "$5" && at_fn_banner $5
-  at_desc="$3"
-  case $1 in
-    [0-9])      at_desc_line="  $1: ";;
-    [0-9][0-9]) at_desc_line=" $1: " ;;
-    *)          at_desc_line="$1: "  ;;
-  esac
-  as_fn_append at_desc_line "$3$4"
-  $at_quiet $as_echo_n "$at_desc_line"
-  echo "#                             -*- compilation -*-" >> "$at_group_log"
-}
-
-# at_fn_group_postprocess
-# -----------------------
-# Perform cleanup after running a test group.
-at_fn_group_postprocess ()
+# at_func_group_postprocess
+# -------------------------
+at_func_group_postprocess ()
 {
   # Be sure to come back to the suite directory, in particular
   # since below we might `rm' the group directory we are in currently.
@@ -1552,7 +1528,6 @@ at_fn_group_postprocess ()
       report this failure to <opendap-tech at opendap.org>.
 _ATEOF
     $as_echo "$at_setup_line" >"$at_check_line_file"
-    at_status=99
   fi
   $at_verbose $as_echo_n "$at_group. $at_setup_line: "
   $as_echo_n "$at_group. $at_setup_line: " >> "$at_group_log"
@@ -1561,41 +1536,31 @@ _ATEOF
 	at_msg="UNEXPECTED PASS"
 	at_res=xpass
 	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     no:0)
 	at_msg="ok"
 	at_res=pass
 	at_errexit=false
-	at_color=$at_grn
 	;;
     *:77)
 	at_msg='skipped ('`cat "$at_check_line_file"`')'
 	at_res=skip
 	at_errexit=false
-	at_color=$at_blu
-	;;
-    no:* | *:99)
-	at_msg='FAILED ('`cat "$at_check_line_file"`')'
-	at_res=fail
-	at_errexit=$at_errexit_p
-	at_color=$at_red
 	;;
     yes:*)
 	at_msg='expected failure ('`cat "$at_check_line_file"`')'
 	at_res=xfail
 	at_errexit=false
-	at_color=$at_lgn
+	;;
+    no:*)
+	at_msg='FAILED ('`cat "$at_check_line_file"`')'
+	at_res=fail
+	at_errexit=$at_errexit_p
 	;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
-  # In parallel mode, output the summary line only afterwards.
-  if test $at_jobs -ne 1 && test -n "$at_verbose"; then
-    $as_echo "$at_desc_line $at_color$at_msg$at_std"
-  else
-    # Make sure there is a separator even with long titles.
-    $as_echo " $at_color$at_msg$at_std"
-  fi
+  # Make sure there is a separator even with long titles.
+  $as_echo " $at_msg"
   at_log_msg="$at_group. $at_desc ($at_setup_line): $at_msg"
   case $at_status in
     0|77)
@@ -1610,13 +1575,9 @@ _ATEOF
       $as_echo "$at_log_msg" >> "$at_group_log"
       $as_echo "$at_log_msg" >&5
 
-      # Cleanup the group directory, unless the user wants the files
-      # or the success was unexpected.
-      if $at_debug_p || test $at_res = xpass; then
-	at_fn_create_debugging_script
-	if test $at_res = xpass && $at_errexit; then
-	  echo stop > "$at_stop_file"
-	fi
+      # Cleanup the group directory, unless the user wants the files.
+      if $at_debug_p; then
+	at_func_create_debugging_script
       else
 	if test -d "$at_group_dir"; then
 	  find "$at_group_dir" -type d ! -perm -700 -exec chmod u+rwx \{\} \;
@@ -1633,7 +1594,7 @@ _ATEOF
 
       # Upon failure, keep the group directory for autopsy, and create
       # the debugging script.  With -e, do not start any further tests.
-      at_fn_create_debugging_script
+      at_func_create_debugging_script
       if $at_errexit; then
 	echo stop > "$at_stop_file"
       fi
@@ -1646,134 +1607,22 @@ _ATEOF
 ## Driver loop. ##
 ## ------------ ##
 
-
-if (set -m && set +m && set +b) >/dev/null 2>&1; then
-  set +b
-  at_job_control_on='set -m' at_job_control_off='set +m' at_job_group=-
-else
-  at_job_control_on=: at_job_control_off=: at_job_group=
-fi
-
-for at_signal in 1 2 15; do
-  trap 'set +x; set +e
-	$at_job_control_off
-	at_signal='"$at_signal"'
-	echo stop > "$at_stop_file"
-	trap "" $at_signal
-	at_pgids=
-	for at_pgid in `jobs -p 2>/dev/null`; do
-	  at_pgids="$at_pgids $at_job_group$at_pgid"
-	done
-	test -z "$at_pgids" || kill -$at_signal $at_pgids 2>/dev/null
-	wait
-	if test "$at_jobs" -eq 1 || test -z "$at_verbose"; then
-	  echo >&2
-	fi
-	at_signame=`kill -l $at_signal 2>&1 || echo $at_signal`
-	set x $at_signame
-	test 1 -gt 2 && at_signame=$at_signal
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: caught signal $at_signame, bailing out" >&5
-$as_echo "$as_me: WARNING: caught signal $at_signame, bailing out" >&2;}
-	as_fn_arith 128 + $at_signal && exit_status=$as_val
-	as_fn_exit $exit_status' $at_signal
-done
-
 rm -f "$at_stop_file"
 at_first=:
 
-if test $at_jobs -ne 1 &&
-     rm -f "$at_job_fifo" &&
-     test -n "$at_job_group" &&
-     ( mkfifo "$at_job_fifo" && trap 'exit 1' PIPE STOP TSTP ) 2>/dev/null
-then
-  # FIFO job dispatcher.
-
-  trap 'at_pids=
-	for at_pid in `jobs -p`; do
-	  at_pids="$at_pids $at_job_group$at_pid"
-	done
-	if test -n "$at_pids"; then
-	  at_sig=TSTP
-	  test "${TMOUT+set}" = set && at_sig=STOP
-	  kill -$at_sig $at_pids 2>/dev/null
-	fi
-	kill -STOP $$
-	test -z "$at_pids" || kill -CONT $at_pids 2>/dev/null' TSTP
-
-  echo
-  # Turn jobs into a list of numbers, starting from 1.
-  at_joblist=`$as_echo "$at_groups" | sed -n 1,${at_jobs}p`
-
-  set X $at_joblist
-  shift
-  for at_group in $at_groups; do
-    $at_job_control_on 2>/dev/null
-    (
-      # Start one test group.
-      $at_job_control_off
-      if $at_first; then
-	exec 7>"$at_job_fifo"
-      else
-	exec 6<&-
-      fi
-      trap 'set +x; set +e
-	    trap "" PIPE
-	    echo stop > "$at_stop_file"
-	    echo >&7
-	    as_fn_exit 141' PIPE
-      at_fn_group_prepare
-      if cd "$at_group_dir" &&
-	 at_fn_test $at_group &&
-	 . "$at_test_source"
-      then :; else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
+for at_group in $at_groups; do
+  at_func_group_prepare
+  if cd "$at_group_dir" &&
+     at_func_test $at_group &&
+     . "$at_test_source"; then :; else
+    { $as_echo "$as_me:$LINENO: WARNING: unable to parse test group: $at_group" >&5
 $as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-	at_failed=:
-      fi
-      at_fn_group_postprocess
-      echo >&7
-    ) &
-    $at_job_control_off
-    if $at_first; then
-      at_first=false
-      exec 6<"$at_job_fifo" 7>"$at_job_fifo"
-    fi
-    shift # Consume one token.
-    if test $# -gt 0; then :; else
-      read at_token <&6 || break
-      set x $*
-    fi
-    test -f "$at_stop_file" && break
-  done
-  exec 7>&-
-  # Read back the remaining ($at_jobs - 1) tokens.
-  set X $at_joblist
-  shift
-  if test $# -gt 0; then
-    shift
-    for at_job
-    do
-      read at_token
-    done <&6
+    at_failed=:
   fi
-  exec 6<&-
-  wait
-else
-  # Run serially, avoid forks and other potential surprises.
-  for at_group in $at_groups; do
-    at_fn_group_prepare
-    if cd "$at_group_dir" &&
-       at_fn_test $at_group &&
-       . "$at_test_source"; then :; else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to parse test group: $at_group" >&5
-$as_echo "$as_me: WARNING: unable to parse test group: $at_group" >&2;}
-      at_failed=:
-    fi
-    at_fn_group_postprocess
-    test -f "$at_stop_file" && break
-    at_first=false
-  done
-fi
+  at_func_group_postprocess
+  test -f "$at_stop_file" && break
+  at_first=false
+done
 
 # Wrap up the test suite with summary statistics.
 cd "$at_helper_dir"
@@ -1794,9 +1643,12 @@ set X $at_xfail_list; shift; at_xfail_count=$#
 set X $at_fail_list; shift; at_fail_count=$#; at_fail_list=$*
 set X $at_skip_list; shift; at_skip_count=$#
 
-as_fn_arith $at_group_count - $at_skip_count && at_run_count=$as_val
-as_fn_arith $at_xpass_count + $at_fail_count && at_unexpected_count=$as_val
-as_fn_arith $at_xfail_count + $at_fail_count && at_total_fail_count=$as_val
+at_func_arith $at_group_count - $at_skip_count
+at_run_count=$at_func_arith_result
+at_func_arith $at_xpass_count + $at_fail_count
+at_unexpected_count=$at_func_arith_result
+at_func_arith $at_xfail_count + $at_fail_count
+at_total_fail_count=$at_func_arith_result
 
 # Back to the top directory.
 cd "$at_dir"
@@ -1808,26 +1660,35 @@ at_stop_time=`date +%s 2>/dev/null`
 $as_echo "$as_me: ending at: $at_stop_date" >&5
 case $at_start_time,$at_stop_time in
   [0-9]*,[0-9]*)
-    as_fn_arith $at_stop_time - $at_start_time && at_duration_s=$as_val
-    as_fn_arith $at_duration_s / 60 && at_duration_m=$as_val
-    as_fn_arith $at_duration_m / 60 && at_duration_h=$as_val
-    as_fn_arith $at_duration_s % 60 && at_duration_s=$as_val
-    as_fn_arith $at_duration_m % 60 && at_duration_m=$as_val
+    at_func_arith $at_stop_time - $at_start_time
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_s / 60
+    at_duration_m=$at_func_arith_result
+    at_func_arith $at_duration_m / 60
+    at_duration_h=$at_func_arith_result
+    at_func_arith $at_duration_s % 60
+    at_duration_s=$at_func_arith_result
+    at_func_arith $at_duration_m % 60
+    at_duration_m=$at_func_arith_result
     at_duration="${at_duration_h}h ${at_duration_m}m ${at_duration_s}s"
     $as_echo "$as_me: test suite duration: $at_duration" >&5
     ;;
 esac
 
 echo
-$as_echo "## ------------- ##
+cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
 echo
 {
   echo
-  $as_echo "## ------------- ##
+  cat <<\_ASBOX
+## ------------- ##
 ## Test results. ##
-## ------------- ##"
+## ------------- ##
+_ASBOX
   echo
 } >&5
 
@@ -1845,14 +1706,12 @@ if $at_errexit_p && test $at_unexpected_count != 0; then
     at_result="$at_result $at_were run, one failed"
   fi
   at_result="$at_result unexpectedly and inhibited subsequent tests."
-  at_color=$at_red
 else
   # Don't you just love exponential explosion of the number of cases?
-  at_color=$at_red
   case $at_xpass_count:$at_fail_count:$at_xfail_count in
     # So far, so good.
-    0:0:0) at_result="$at_result $at_were successful." at_color=$at_grn ;;
-    0:0:*) at_result="$at_result behaved as expected." at_color=$at_lgn ;;
+    0:0:0) at_result="$at_result $at_were successful." ;;
+    0:0:*) at_result="$at_result behaved as expected." ;;
 
     # Some unexpected failures
     0:*:0) at_result="$at_result $at_were run,
@@ -1898,16 +1757,18 @@ $at_skip_count tests were skipped." ;;
 esac
 
 if test $at_unexpected_count = 0; then
-  echo "$at_color$at_result$at_std"
+  echo "$at_result"
   echo "$at_result" >&5
 else
-  echo "${at_color}ERROR: $at_result$at_std" >&2
+  echo "ERROR: $at_result" >&2
   echo "ERROR: $at_result" >&5
   {
     echo
-    $as_echo "## ------------------------ ##
+    cat <<\_ASBOX
+## ------------------------ ##
 ## Summary of the failures. ##
-## ------------------------ ##"
+## ------------------------ ##
+_ASBOX
 
     # Summary of failed and skipped tests.
     if test $at_fail_count != 0; then
@@ -1926,9 +1787,11 @@ else
       echo
     fi
     if test $at_fail_count != 0; then
-      $as_echo "## ---------------------- ##
+      cat <<\_ASBOX
+## ---------------------- ##
 ## Detailed failed tests. ##
-## ---------------------- ##"
+## ---------------------- ##
+_ASBOX
       echo
       for at_group in $at_fail_list
       do
@@ -1960,21 +1823,19 @@ _ASBOX
 _ASBOX
 
   echo
-  if $at_debug_p; then
-    at_msg='per-test log files'
-  else
-    at_msg="\`${at_testdir+${at_testdir}/}$as_me.log'"
-  fi
-  $as_echo "Please send $at_msg and all information you think might help:
+  $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:
 
    To: <opendap-tech at opendap.org>
-   Subject: [libdap 3.18.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
-
-You may investigate any problem if you feel able to do so, in which
-case the test suite provides a good starting point.  Its output may
-be found below \`${at_testdir+${at_testdir}/}$as_me.dir'.
+   Subject: [libdap 3.18.2] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 "
-  exit 1
+  if test $at_debug_p = false; then
+    echo
+    echo 'You may investigate any problem if you feel able to do so, in which'
+    echo 'case the test suite provides a good starting point.  Its output may'
+    $as_echo "be found below \`${at_testdir+${at_testdir}/}$as_me.dir'."
+    echo
+  fi
+    exit 1
 fi
 
 exit 0
@@ -1983,12 +1844,15 @@ exit 0
 ## Actual tests. ##
 ## ------------- ##
 #AT_START_1
-at_fn_group_banner 1 'getdapTest.at:34' \
-  "getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)" ""
+# 1. getdapTest.at:34: getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)
+at_setup_line='getdapTest.at:34'
+at_desc="getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc getdap-testsuite/fnoc1.nc.dds (pass)"
+$at_quiet $as_echo_n "  1: $at_desc"
 at_xfail=no
       test "pass" = "xfail" && at_xfail=yes
+echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  $as_echo "1. $at_setup_line: testing $at_desc ..."
+  $as_echo "1. getdapTest.at:34: testing ..."
   $at_traceon
 
 
@@ -2000,35 +1864,49 @@ at_xfail=no
     # successful runs are sent to stdout while the errors are sent to
     # stderr.
 
-    { set +x
+    { $at_traceoff
 $as_echo "$at_srcdir/getdapTest.at:34: \$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true"
-at_fn_check_prepare_dynamic "$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true" "getdapTest.at:34"
-( $at_check_trace; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
+echo getdapTest.at:34 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "$abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true"; then
+  ( $at_traceon; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; $abs_builddir/../getdap -d http://test.opendap.org/dap/data/nc/fnoc1.nc || true ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
-    { set +x
+    { $at_traceoff
 $as_echo "$at_srcdir/getdapTest.at:34: diff -b -B \$abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B \$abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr"
-at_fn_check_prepare_dynamic "diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr" "getdapTest.at:34"
-( $at_check_trace; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo getdapTest.at:34 >"$at_check_line_file"
+
+if test -n "$at_traceon" \
+  && at_func_check_newline "diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr"; then
+  ( $at_traceon; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr ) >"$at_stdout" 2>"$at_stder1"
+  at_func_filter_trace $?
+else
+  ( :; diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stdout || diff -b -B $abs_srcdir/getdap-testsuite/fnoc1.nc.dds stderr ) >"$at_stdout" 2>"$at_stderr"
+fi
+at_status=$?
+at_failed=false
+at_func_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
-$at_failed && at_fn_log_failure
+at_func_check_status 0 $at_status "$at_srcdir/getdapTest.at:34"
+
+$at_failed && at_func_log_failure
 $at_traceon; }
 
 
-      set +x
+      $at_traceoff
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
+) 5>&1 2>&1 | eval $at_tee_pipe
+at_status=`cat "$at_status_file"`
 #AT_STOP_1
diff --git a/tests/package.m4 b/tests/package.m4
index 32a61de..3751f93 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [libdap])
 m4_define([AT_PACKAGE_TARNAME],   [libdap])
-m4_define([AT_PACKAGE_VERSION],   [3.18.1])
-m4_define([AT_PACKAGE_STRING],    [libdap 3.18.1])
+m4_define([AT_PACKAGE_VERSION],   [3.18.2])
+m4_define([AT_PACKAGE_STRING],    [libdap 3.18.2])
 m4_define([AT_PACKAGE_BUGREPORT], [opendap-tech at opendap.org])
diff --git a/unit-tests/D4FilterClauseTest.cc b/unit-tests/D4FilterClauseTest.cc
index 4146fc1..27b52d2 100644
--- a/unit-tests/D4FilterClauseTest.cc
+++ b/unit-tests/D4FilterClauseTest.cc
@@ -566,7 +566,7 @@ int main(int argc, char*argv[]) {
     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
 
     GetOpt getopt(argc, argv, "d");
-    char option_char;
+    int option_char;
 
     while ((option_char = getopt()) != EOF)
         switch (option_char) {
diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in
index aaa2537..0b00e64 100644
--- a/unit-tests/Makefile.in
+++ b/unit-tests/Makefile.in
@@ -815,7 +815,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/unit-tests/cache-testsuite/Makefile.in b/unit-tests/cache-testsuite/Makefile.in
index 204923b..014d368 100644
--- a/unit-tests/cache-testsuite/Makefile.in
+++ b/unit-tests/cache-testsuite/Makefile.in
@@ -484,7 +484,6 @@ PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_SUBMINOR_VERSION = @PACKAGE_SUBMINOR_VERSION@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
diff --git a/unit-tests/test_config.h b/unit-tests/test_config.h
index 196e91c..63f9e57 100644
--- a/unit-tests/test_config.h
+++ b/unit-tests/test_config.h
@@ -1,7 +1,7 @@
 #ifndef E_test_config_h
 #define E_test_config_h
 
-#define TEST_SRC_DIR "/Users/jimg/src/opendap/hyrax_git/libdap4/unit-tests"
+#define TEST_SRC_DIR "/home/ec2-user/hyrax/libdap4/unit-tests"
 
 #endif
 
diff --git a/util.cc b/util.cc
index 2cf883f..b7c4a4a 100644
--- a/util.cc
+++ b/util.cc
@@ -331,6 +331,9 @@ template<class T> static void extract_double_array_helper(Array * a, vector<doub
  * array using 'new double[n]' so delete[] MUST be used when you are done
  * the data.
  *
+ * @note Before you call this function, you must call read on the array,
+ * or load the array with values and set the read_p property.
+ *
  * @note Support added for DAP4.
  * @param a Extract value from this Array.
  * @param dest Put the values in this vector. A value-result parameter.
@@ -346,7 +349,7 @@ void extract_double_array(Array *a, vector<double> &dest)
         throw Error(malformed_expr, "The function requires a DAP numeric-type array argument.");
 
     if (!a->read_p())
-        throw InternalErr(__FILE__, __LINE__, string("The Array '") + a->name() + "'does not contain values.");
+        throw InternalErr(__FILE__, __LINE__, string("The Array '") + a->name() + "' does not contain values.");
 
     dest.resize(a->length());
 
diff --git a/xdr-datatypes.h b/xdr-datatypes.h
index 9167595..c918cf8 100644
--- a/xdr-datatypes.h
+++ b/xdr-datatypes.h
@@ -20,10 +20,10 @@
 
 
 #define XDR_INT32 xdr_int32_t
-#define XDR_UINT32 xdr_u_int32_t
+#define XDR_UINT32 xdr_uint32_t
 
 #define XDR_INT16 xdr_int16_t
-#define XDR_UINT16 xdr_u_int16_t
+#define XDR_UINT16 xdr_uint16_t
 
 #define XDR_FLOAT64 xdr_double
 #define XDR_FLOAT32 xdr_float

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git



More information about the debian-science-commits mailing list